fix minor graph variable refactoring bugs.