Fixup the classifiers