Fixes for moving to subgraph