Tweaks to make Heroku happy