Added fine grained locking to more benchmarks
Merge