Twig strict fixes