Further adjustments for Heroku