Fixes and one additional check for TYPO3