Fix 6.0 Native API reference issues