Fixing issues found while developing the new Twig based template