Small template cleanups
Possible fix for heroku deployments