Fix graph tools