Fix win32 packaging
Fix win32 packaging
Code clean
Code clean