Corrected couple of bugs on Graphs