Fixup
Change the way we handle flags