Update for warning and gum-heap regression fixes