Vanity tweaks (more will follow)