Slight cosmetic fixes