More tweaks for Heroku2