Modification from fixes for Toporama in GCViz