Bugfixes to new-app-templates, etc