Made some changes for Heroku