Cleaning up bugs in admin code section