Actually fix the key mappings.