Locking fixes and instrumentation.
4 files changed