Use correct rev for lock
Use correct rev for snapshotting