Fixes for heroku