Introspection fixes