Fix remaining incompatibilities with graphviz > 2.30