Fixes in Admin Console