Updated compilation for Windows