Classification Bugs Fixed