Some more cosmetic updates