diff --git a/generator/category_to_speed.cpp b/generator/category_to_speed.cpp
index 997b0edb90..8682aee207 100644
--- a/generator/category_to_speed.cpp
+++ b/generator/category_to_speed.cpp
@@ -10,8 +10,8 @@ struct Speed
 {
   Speed() = delete;
 
-  uint16_t m_speed;
-  Units m_units;
+  uint16_t m_speed = 0;
+  Units m_units = Units::Metric;
 };
 
 std::unordered_map<std::string, Speed> const kRoadCategoryToSpeedKMpH = {
diff --git a/generator/maxspeed_builder.cpp b/generator/maxspeed_builder.cpp
index 4b351e0c06..7f4ab23de8 100644
--- a/generator/maxspeed_builder.cpp
+++ b/generator/maxspeed_builder.cpp
@@ -7,6 +7,6 @@ namespace generator
 bool BuildMaxspeed(std::string const & dataPath, std::string const & osmToFeaturePath,
                    std::string const & maxspeedFilename)
 {
-  return true;
+  return false;
 }
 }  // namespace generator
diff --git a/generator/maxspeed_collector.cpp b/generator/maxspeed_collector.cpp
index d57bc7df6e..e729cc5f1b 100644
--- a/generator/maxspeed_collector.cpp
+++ b/generator/maxspeed_collector.cpp
@@ -42,7 +42,7 @@ void MaxspeedCollector::Process(OsmElement const & p)
 
   // Note 1. isReverse == true means feature |p| has tag "oneway" with value "-1". Now (10.2018)
   // no feature with a tag oneway==-1 and a tag maxspeed:forward/backward is found. But to
-  // be on the safe side the case is processed.
+  // be on the safe side this case is handled.
   // Note 2. If oneway==-1 the order of points is changed while conversion to mwm. So it's
   // necessary to swap forward and backward as well.
   if (isReverse)
@@ -63,7 +63,7 @@ void MaxspeedCollector::Flush()
   LOG(LINFO, ("Saving maxspeed tag values to", m_filePath));
   ofstream stream(m_filePath);
 
-  if (!stream.is_open())
+  if (!stream)
   {
     LOG(LERROR, ("Cannot open file", m_filePath));
     return;
diff --git a/generator/maxspeed_collector.hpp b/generator/maxspeed_collector.hpp
index 551248271b..f08fd6a6ca 100644
--- a/generator/maxspeed_collector.hpp
+++ b/generator/maxspeed_collector.hpp
@@ -2,8 +2,8 @@
 
 #include "generator/osm_element.hpp"
 
-#include <list>
 #include <string>
+#include <vector>
 
 namespace feature
 {
@@ -36,7 +36,7 @@ private:
   // Note. Saying osm id means osm id of features with OsmElement::EntityType::Way type without
   // any prefixes. It's done so to simplify the debugging process. This way it's very easy knowing
   // osm id to see the feature on the web.
-  std::list<std::string> m_data;
+  std::vector<std::string> m_data;
   std::string m_filePath;
 };
 }  // namespace feature
diff --git a/routing/maxspeed_conversion.cpp b/routing/maxspeed_conversion.cpp
index 119eff8546..d57f5ea153 100644
--- a/routing/maxspeed_conversion.cpp
+++ b/routing/maxspeed_conversion.cpp
@@ -2,4 +2,4 @@
 
 namespace routing
 {
-}  // namespace routing
\ No newline at end of file
+}  // namespace routing
diff --git a/routing/routing_helpers.hpp b/routing/routing_helpers.hpp
index a92dd79199..0568f05d56 100644
--- a/routing/routing_helpers.hpp
+++ b/routing/routing_helpers.hpp
@@ -89,4 +89,4 @@ bool CheckGraphConnectivity(typename Graph::Vertex const & start, size_t limit,
 
   return marked.size() >= limit;
 }
-}  // namespace rouing
+}  // namespace routing