More fixes for heroku