Heroku-related tweaks