More graph fixes