Updates for Win32 compatibility