A couple of fixes for heroku