Additional changes for Heroku