Fixes in admin namespace