Fixed up to track the latest OM changes.