oid fixes