Fixes to hanging outstanding flag