Certain flags were sqashing each other. Make them unique, as they should be.

Ticket: #6960