diff --git a/Classes/ViewHelpers/ExtendedIfViewHelper.php b/Classes/ViewHelpers/ExtendedIfViewHelper.php
index 8dd5e32002864688bbe2040335168ce23ef1357f..15bdd046be79eb8f88e7fe1ab3b71cc059b0f676 100644
--- a/Classes/ViewHelpers/ExtendedIfViewHelper.php
+++ b/Classes/ViewHelpers/ExtendedIfViewHelper.php
@@ -26,6 +26,7 @@ namespace SGalinski\SgNews\ViewHelpers;
  *  This copyright notice MUST APPEAR in all copies of the script!
  ***************************************************************/
 
+use TYPO3\CMS\Core\Utility\VersionNumberUtility;
 use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractConditionViewHelper;
 
 /**
@@ -37,9 +38,11 @@ class ExtendedIfViewHelper extends AbstractConditionViewHelper {
 	 */
 	public function initializeArguments() {
 		parent::initializeArguments();
-		$this->registerArgument(
-			'condition', 'boolean', 'Condition expression conforming to Fluid boolean rules', FALSE, FALSE
-		);
+		if(VersionNumberUtility::convertVersionNumberToInteger(TYPO3_version) < 8000000) {
+			$this->registerArgument(
+				'condition', 'boolean', 'Condition expression conforming to Fluid boolean rules', FALSE, FALSE
+			);
+		}
 		$this->registerArgument(
 			'or', 'boolean', 'Condition expression conforming to Fluid boolean rules', FALSE, FALSE
 		);
diff --git a/Configuration/TypoScript/Frontend/setup.txt b/Configuration/TypoScript/Frontend/setup.txt
index 0662455f427f5e711e2c5f0b3fb14d6e335f55b4..6917a7ee055f4b494e32bc62323d6c8426631b6d 100644
--- a/Configuration/TypoScript/Frontend/setup.txt
+++ b/Configuration/TypoScript/Frontend/setup.txt
@@ -36,6 +36,16 @@ newsFeed {
 	}
 }
 
+[compatVersion = 7.6.0]
+	newsFeed.config.additionalHeaders >
+	newsFeed.config.additionalHeaders {
+		10 {
+			header = Content-type:text/xml
+			replace = 1
+		}
+	}
+[global]
+
 # news feed integration into the site
 page.headerData {
 	273905123652 = TEXT
diff --git a/Resources/Private/Partials/Teaser.html b/Resources/Private/Partials/Teaser.html
index a22e57823d934cd4a7df1d2b1404d1981e4c0007..0f7dc581be9e783691129f74059de8f5d08b2446 100644
--- a/Resources/Private/Partials/Teaser.html
+++ b/Resources/Private/Partials/Teaser.html
@@ -22,7 +22,7 @@
 <f:alias map="{singleViewUri: '{f:uri.page(pageUid: \'{newsMetaData.news.uid}\')}'}">
 	<a href="{singleViewUri}">
 		<f:if condition="{newsMetaData.teaserImageObject}">
-			<div class="tx-sgnews-teaser-image tx-sgnews-teaser-image-stretched" style="background-image: url({f:uri.image(image: '{newsMetaData.teaserImageObject}')});"></div>
+			<div class="tx-sgnews-teaser-image tx-sgnews-teaser-image-stretched" style="background-image: url({f:uri.image(image: newsMetaData.teaserImageObject)});"></div>
 		</f:if>
 		<div class="tx-sgnews-teaser-inner">
 			<div class="tx-sgnews-teaser-title">
diff --git a/Resources/Private/Partials/TeaserOverview.html b/Resources/Private/Partials/TeaserOverview.html
index de7685f4079042e5b59ccfa84ab05ec0eee763f2..2f9288b09bf8aab64754e5d19fae4e607bce1f9b 100644
--- a/Resources/Private/Partials/TeaserOverview.html
+++ b/Resources/Private/Partials/TeaserOverview.html
@@ -1,6 +1,6 @@
 {namespace sg=SGalinski\SgNews\ViewHelpers}
 
-<f:comment xmlns:f="http://www.w3.org/1999/html">
+<f:comment>
 	<!--
 	Usage Example:
 
diff --git a/Resources/Private/Templates/ListByCategory/Index.html b/Resources/Private/Templates/ListByCategory/Index.html
index 35795fd47bed58aceb061e5afe021603118c8655..29ca35f8e985009a1d8224f394c12733f7942974 100644
--- a/Resources/Private/Templates/ListByCategory/Index.html
+++ b/Resources/Private/Templates/ListByCategory/Index.html
@@ -26,7 +26,7 @@
 				</f:for>
 			</ul>
 
-			<sg:pageBrowser numberOfPages="{numberOfPages}" />
+			<f:format.raw><sg:pageBrowser numberOfPages="{numberOfPages}" /></f:format.raw>
 		</div>
 	</section>
 </f:section>
diff --git a/Resources/Private/Templates/Overview/Overview.html b/Resources/Private/Templates/Overview/Overview.html
index c69e01c66d156c11266f0ee738f167fbb4a88fb5..06cd3dddde6e931efb6598713786ae85c75e63cc 100644
--- a/Resources/Private/Templates/Overview/Overview.html
+++ b/Resources/Private/Templates/Overview/Overview.html
@@ -70,5 +70,5 @@
 		</div>
 	</div>
 
-	<sg:pageBrowser numberOfPages="{numberOfPages}" />
+	<f:format.raw><sg:pageBrowser numberOfPages="{numberOfPages}" /></f:format.raw>
 </f:section>
diff --git a/Resources/Private/Templates/Overview/OverviewWithoutCategories.html b/Resources/Private/Templates/Overview/OverviewWithoutCategories.html
index f8be5790822614c97ad7eca9c923ce37b16d1b1a..4eea37138f3eee4642489c5a687750d692bf7ce1 100644
--- a/Resources/Private/Templates/Overview/OverviewWithoutCategories.html
+++ b/Resources/Private/Templates/Overview/OverviewWithoutCategories.html
@@ -18,5 +18,5 @@
 		</ul>
 	</div>
 
-	<sg:pageBrowser numberOfPages="{numberOfPages}" />
+	<f:format.raw><sg:pageBrowser numberOfPages="{numberOfPages}" /></f:format.raw>
 </f:section>
\ No newline at end of file