Minor changes for heroku & local use