Making Heroku ready