Merge the right tty-fixes branch