Fixes for google changes on new server