Fixing up some templates and defaults.