Add in changes by Ugo, fix echo on tmux.