CXX-54 Fixups for windows after build system minimization