Make Heroku-friendly