Fixes to templates and defaults.