Fix order in modes - undo preliminary locks