A bunch of template changes for consistency