minor fixes for twig