Minor changes to the templates