fix sync errors

Change-Id: I70509a2ef5478785e0cf13630cbca1ba995e6a6e