[hsadmin] More updates