Classifing fixes