Patched modifications for Heroku support.