Fixes for heroku
Fixes for heroku
Fixes for heroku