Fix guest templating