Several fixes for subprojects.