Correcting endpoints and client