Fixing some graph issues