Fixes for heroku deploy