Updates for Heroku deploy