Tweak for Heroku compatibility