Various fix in templates