graph.rs fixes