Fix TClassAttributeMap and TClass