Fixed some issues with twig because the update..