Some graph fixes