graph: issues fix