Temporarily fixing some graphPI bugs.