[sync] Additional API changes to fix key parts of the sync engine