eclient fixes