GraphView fixes