Minor corrections to template