Fix ugly flags