Heroku-related fixes