Fixes for Heroku