Contao 3.3 fixes