Modify flags to be non-destructive by default