Some fixes in determining which classifiers to include.