Fix a couple of keymap load/save/default bugs