CONTROL-C fixes