Fixes to admin

Admin fixes