Make Heroku compatible