More LabelCollection fixes