fixes for heroku usage