More label fixes