Small fixes for classification.