diff --git a/base/levenshtein_dfa.cpp b/base/levenshtein_dfa.cpp
index 9d1a5cf7b3..070f104c9c 100644
--- a/base/levenshtein_dfa.cpp
+++ b/base/levenshtein_dfa.cpp
@@ -133,7 +133,7 @@ bool LevenshteinDFA::Position::SubsumedBy(Position const & rhs) const
   if (m_errorsLeft >= rhs.m_errorsLeft)
     return false;
 
-  auto const errorsAvail = rhs.m_errorsLeft - m_errorsLeft;
+  auto const errorsAvail = static_cast<size_t>(rhs.m_errorsLeft - m_errorsLeft);
 
   if (IsStandard() && rhs.IsStandard())
     return AbsDiff(m_offset, rhs.m_offset) <= errorsAvail;
diff --git a/search/mwm_context.cpp b/search/mwm_context.cpp
index 76544b7560..825dbcc961 100644
--- a/search/mwm_context.cpp
+++ b/search/mwm_context.cpp
@@ -39,6 +39,7 @@ bool MwmContext::GetFeature(uint32_t index, FeatureType & ft) const
     return true;
   }
   CHECK_SWITCH();
+  return false;
 }
 
 bool MwmContext::GetOriginalFeature(uint32_t index, FeatureType & ft) const