Another tweak prior to heroku changes