Dataobject fixes