Compatibility with latest changes in uos