class reflection fixes