Small additions to admin/cli