NCTerminal fixes