More label tweaks