Added checks for win32