Fixed some issues with the AdminController