Fix class bases of some of these objects