Fixes for graph plugin