Minor improvements for Win32.