small changes to improve compatibility for heroku