Switch these two classes to use VirtualLocks