Fix introspection issues