fixes for heroku and mobile