Changes for Heroku deploy