Cleaning up NativePlatform definitions
Fixes known win failures