Uniobject fixes