Some fixes for Heroku
Some fixes for Heroku 2