More label fixes to make this easily understandable