More Heroku compatibility.