Updates to get build working on Bill's air-gapped windows box