Bugfixes for the graph view