Fix x86 Windows build and testsuite