Minor cosmetic updates