Final bugfixes for Heroku