Fixed data races, deadlocks, hung notes by further correcting lock placements