Fixes and one additional check for TYPO3
Merge pull request #160 from RealRancor/typo3-fixes

Fixes and one additional check for TYPO3