More fixes to new classify functions.