Bug 975388 - oo-admin-usage fixes