Fixed typos
Reverted some changes to echequeClient in lieu of better fixes