Minor changes for Heroku
More heroku changes