Update for Ord changes