Bugfixes to Graphhandler.