Fix up some flag ambiguity