Catacurses fixup