A Couple more fixes for the sub-graphs.