Fix manage client issues