Made some changes for heroku