Update to build on Windows