more cmake builds fixed for modules on windows