Fixed, for the most part, ranks and flags.