Updated to latest util changes