diff --git a/deebot_client/capabilities.py b/deebot_client/capabilities.py
index 1181ed45d..3fb27b5c9 100644
--- a/deebot_client/capabilities.py
+++ b/deebot_client/capabilities.py
@@ -174,10 +174,10 @@ class CapabilityMap:
     changed: CapabilityEvent[MapChangedEvent]
     clear: CapabilityExecute[[]] | None = None
     major: CapabilityEvent[MajorMapEvent]
-    minor: CapabilityExecute[[str, int]]
-    multi_state: CapabilitySetEnable[MultimapStateEvent]
+    minor: CapabilityExecute[[int, str]]
+    multi_state: CapabilitySetEnable[MultimapStateEvent] | None = None
     position: CapabilityEvent[PositionsEvent]
-    relocation: CapabilityExecute[[]]
+    relocation: CapabilityExecute[[]] | None = None
     rooms: CapabilityEvent[RoomsEvent]
     trace: CapabilityEvent[MapTraceEvent]
 
@@ -213,7 +213,7 @@ class CapabilitySettings:
     sweep_mode: CapabilitySetEnable[SweepModeEvent] | None = None
     true_detect: CapabilitySetEnable[TrueDetectEvent] | None = None
     voice_assistant: CapabilitySetEnable[VoiceAssistantStateEvent] | None = None
-    volume: CapabilitySet[VolumeEvent, [int]]
+    volume: CapabilitySet[VolumeEvent, [int]] | None = None
 
 
 @dataclass(frozen=True, kw_only=True)
diff --git a/deebot_client/commands/json/map.py b/deebot_client/commands/json/map.py
index 8aba84596..92f98a518 100644
--- a/deebot_client/commands/json/map.py
+++ b/deebot_client/commands/json/map.py
@@ -389,7 +389,7 @@ class GetMinorMap(JsonCommandWithMessageHandling, MessageBodyDataDict):
 
     NAME = "getMinorMap"
 
-    def __init__(self, map_id: str, piece_index: int) -> None:
+    def __init__(self, piece_index: int, map_id: str) -> None:
         super().__init__({"mid": map_id, "type": "ol", "pieceIndex": piece_index})
 
     @classmethod
diff --git a/deebot_client/commands/xml/map.py b/deebot_client/commands/xml/map.py
index d2dec98eb..fbcfd84af 100644
--- a/deebot_client/commands/xml/map.py
+++ b/deebot_client/commands/xml/map.py
@@ -239,7 +239,7 @@ class PullMP(XmlCommandWithMessageHandling):
 
     NAME = "PullMP"
 
-    def __init__(self, *, piece_index: int) -> None:
+    def __init__(self, piece_index: int, _: str | None = None) -> None:
         self._piece_index = piece_index
         super().__init__({"pid": str(piece_index)})
 
diff --git a/deebot_client/map.py b/deebot_client/map.py
index 52dad3a26..54f6dc00b 100644
--- a/deebot_client/map.py
+++ b/deebot_client/map.py
@@ -105,7 +105,7 @@ async def on_major_map(event: MajorMapEvent) -> None:
                     ):
                         tg.create_task(
                             self._execute_command(
-                                self._capabilities.minor.execute(event.map_id, idx)
+                                self._capabilities.minor.execute(idx, event.map_id)
                             )
                         )