Updates for win32 build