Updates necessary for compilation on Windows