Fix some public API classes to match Introspection data.