Largely cosmetic changes