[OE-4360] Tweaks to get label working