Fixing few issues with graphs