Cosmetic changes to flags