fix(classes) misc fixes