Changes made for fixing graph related issues.