Fix attempt: Heroku break, minor adjustments