Fixed some issues with the old graph builder