Some mapping changes to avoid loosing commands.