[BUGFIX] A few bugs in TYPO3 6.1

Change-Id: I37461c73b93404667c276a44d8b8906552300336
Reviewed-on: https://review.typo3.org/25257
Reviewed-by: Xavier Perseguers
Tested-by: Xavier Perseguers