Some fixes to accelerator key mapping.