Minor adjusts at template