Minor fixes for Heroku