Minor improvements to labels