Bugs 973905,974019,973930,973906 - oo-admin-chk fixes