client fixes
fix?
fix2?