More cosmetic updates ...