fix some recursions in admin