More compilation fixes for Win32