Fix key-mappings