Trying some more stringent locking