diff --git a/libs/editor/feature_type_to_osm.cpp b/libs/editor/feature_type_to_osm.cpp
index 9b8ebdcea..39e63d3f3 100644
--- a/libs/editor/feature_type_to_osm.cpp
+++ b/libs/editor/feature_type_to_osm.cpp
@@ -40,7 +40,7 @@ void TypeToOSMTranslator::LoadFromStream(std::istream & s)
         line.back() != ';')
       continue;
 
-    std::vector<std::string_view> rowTokens = strings::Tokenize(line, ";");
+    std::vector<std::string_view> const rowTokens = strings::Tokenize(line, ";");
     if (rowTokens.size() < 2)
     {
       ASSERT(false, ("Invalid feature type definition:", line));
@@ -48,8 +48,8 @@ void TypeToOSMTranslator::LoadFromStream(std::istream & s)
     }
 
     // Get internal feature type
-    std::vector<std::string_view> featureTypeTokens = strings::Tokenize(rowTokens[0], "|");
-    uint32_t type = classif().GetTypeByPathSafe(featureTypeTokens);
+    std::vector<std::string_view> const featureTypeTokens = strings::Tokenize(rowTokens[0], "|");
+    uint32_t const type = classif().GetTypeByPathSafe(featureTypeTokens);
     ASSERT(type != IndexAndTypeMapping::INVALID_TYPE, ("Feature with invalid type:", line));
 
     if (rowTokens.size() == 2)
@@ -77,10 +77,10 @@ void TypeToOSMTranslator::LoadFromStream(std::istream & s)
     else
     {
       // OSM tags are listed in the feature type entry
-      std::vector<std::string_view> osmTagTokens = strings::Tokenize(rowTokens[1], ",");
+      std::vector<std::string_view> const osmTagTokens = strings::Tokenize(rowTokens[1], ",");
 
       // First entry is the best practice way to tag a feature
-      std::string_view osmTagList = osmTagTokens[0];
+      std::string_view const osmTagList = osmTagTokens[0];
 
       // Process OSM tag list (e.g. "[tourism=information][information=office]")
       std::vector<OSMTag> osmTags;
diff --git a/libs/editor/xml_feature.cpp b/libs/editor/xml_feature.cpp
index ad11d5549..5e4cba82a 100644
--- a/libs/editor/xml_feature.cpp
+++ b/libs/editor/xml_feature.cpp
@@ -650,7 +650,7 @@ void XMLFeature::SetOSMTagsForType(uint32_t type)
 
   std::vector<OSMTag> const & osmTags = GetOSMTranslator().OsmTagsFromType(type);
 
-  for(auto const & osmTag : osmTags)
+  for (auto const & osmTag : osmTags)
     SetTagValue(osmTag.key, osmTag.value);
 }