Make Heroku (Production) compatible