Some improvements at the admin side