More fixes for introspection