minor fixes on templates