Heroku client fixes