[TASK] More TYPO3 6.2 compatibility fixes