Changed a few things for deployment to Heroku