Better handling of ctrl-c