Misc NativePlugin class fixing