Make more Heroku-friendly