google integration bug fixes