Address review comments for ksync reorg changes