Contao 3.2.x

Fixes for Contao 3.2