Fixing Google API bugs 1