Fixes for heroku deployment