Changes for google/facebook heroku