more fixes for heroku use