Small consistency fixes for template