Simplify the locking scenario for sync