client fixes, client it case