Some changes for heroku