Graph updates and fixes