Fix Win32 exports
Merge cleanup