Twig fixes