Minor changes in admin handler