fix some class definitions