more minor fixes for twig