Partial 2.4.10 Resolve Pending Issues

Made so class issues don't show label