Fixes for Contao 3