Fixed some twig issues