Curses fixes