admin_base: more tweaks