Fixes for bugs on echequeClient, and import optimizations for bug 198