Fixe bugs and twig