Fix key mappings in CWMR