Graph code fixup