More SM_PATH fixes. This time, everything in class/.