more fixes for heroku