fixes for module dependency graph after windows testing on large
codebase