Bug fixes for the Ctl+c keymap