Fixes to CoreAdmin