Fixes for google auth