more changes to OisWrapper