Moved LockedObject up, related to #115