Minor updates to GraphViewer code