Fix heroku problems