oo-admin-repair fixes
model fixes