Minor Heroku bugfixes