fixes for lock clustering