Fixed stuff for TypeInfo