Graph lib issues fix