Attempting Heroku fixes