Improved building under Windows x86