More 32-bit windows fixes.