Minor fixes for heroku