More fixes for Win32