more fixes to admin