Little changes for win32 target