Fixes to locks after async experiment