Improvements to the compiling for 64-bit Windows