more keymapping fixes.