ncurses: add fixes from #1845