Fix graph and setup