Fix heroku support