Adjustments/fixes for Contao 3

Adjustments/fixes for Contao 3