Make some changes for heroku