Introspection fixes.