Attempt at a fix for ctrl-c issue
More fixes