Minor cleanup for Admin.