oo-admin-repair, oo-admin-chk refactor