minor locking optimizations