client/manage fixes