Fixes to ET_Client and Corrections to Samples