More label resizing fixes