Fixes to google integration