Updates for Heroku (A.8)