Fixed blocking of most operations