diff --git a/map/traffic_manager.cpp b/map/traffic_manager.cpp
index 049e0644a..b30bb18b5 100644
--- a/map/traffic_manager.cpp
+++ b/map/traffic_manager.cpp
@@ -584,7 +584,7 @@ void TrafficManager::ThreadRoutine()
     mwms.clear();
 #endif
   }
-  // Calling Unsubscribe() form the worker thread on exit makes thread synchronization easier
+  // Calling Unsubscribe() from the worker thread on exit makes thread synchronization easier
   Unsubscribe();
 }
 
diff --git a/map/traffic_manager.hpp b/map/traffic_manager.hpp
index c47a1723a..487c70829 100644
--- a/map/traffic_manager.hpp
+++ b/map/traffic_manager.hpp
@@ -532,7 +532,7 @@ private:
   /**
    * Whether the traffic manager accepts mode changes.
    *
-   * Mode cannt be set after the traffic manager has been enabled for the first time.
+   * Mode cannot be set after the traffic manager has been enabled for the first time.
    */
   bool m_canSetMode = true;
 
@@ -631,7 +631,7 @@ private:
    * @brief Whether a poll operation is needed.
    *
    * Used in the worker thread. A poll operation is needed unless a subscription (or subscription
-   * change) operation was performed before and a feed was received a part of it.
+   * change) operation was performed before and a feed was received as part of it.
    */
   bool m_isPollNeeded;