Few more fixes in TUI