Merge branch 'tty-fixes'