Fixes so it will compile again under Win32.