Fix constant references in Graph