more sync fixes

Change-Id: I5e65d8ca8343df930841ea3e9556a8092dac6af8