More Graph Fixes