[cloud-sync] - Fix issues.