minor locking optimizations
2 files changed