Fixed bugs causing errors in subproject tests.