fix some missing class definitions