Adding fixes for google authorization.