Minor adjustments and corrections to templates