Bugs fixes (Graphs)