Fix dedicated and tty client