Fixes for  Heroku