Temporary fork for Win32 work