Applied changes for win32