oo-admin-chk refactor
Bug fixes - 1040314, 1040312, 1040305