Minor tweaks for labels