Compile fixes for Win32