More fixes for the win32 environments