fixes to admin tools