Some minor changes for heroku