Improved build on win32.