Update for Windows compiling