Fix 2 issues in admin