Fixes for windows and newest versions of submodules.