Fix graph issues