Fixes for killing and disconnecting terminals
Change default for named terminals to plain numbers