Some work to get the build working on windows again. Missing tasks added to Asana