Fixes in admin