Fixes for graphviz