Fixed a few errors related with the graph