Related label fixes