Trying to correct bugs in admin