More label improvements.