Fixes for TYPO3 6.2