Changes for Heroku staging