bugfixes for bugs introduced from the oid split