Fixed some of the class definitions

but they are NOT happy