Adjusting to changes in uos_core