Resolve Heroku issues...