flags fixup phase