More cosmetic fixes