Fixed certain bugs in Google sync