client fixes
Revert "client fixes"

This reverts commit b19692e030663183ab2ff93965c921d790eed230.
client fixes