Merge branch 'fixes' into tty-next