Fixes for Win32