Temporary fixes for deployment to Heroku. #4