More label related fixes