Tweaks to the constraint graph stuff