Fixes on gen_admin_class