Fixing subproject builds