Some fixes on the Admin Controller