Graph data fixes