Discovery client fixes