Change a few mappings to support double moves.