google stuff fixes