Changes needed for including sub projects

Correct, not sure where this got lost. Done now.