Fixes to admin