a few more changes for heroku support