diff --git a/search/search_query.hpp b/search/search_query.hpp
index 88a17c0b66..3a52e1ccbd 100644
--- a/search/search_query.hpp
+++ b/search/search_query.hpp
@@ -17,7 +17,7 @@ namespace search
 
 class CategoriesHolder;
 class KeywordMatcher;
-namespace impl { class IntermediateResult; class FeatureLoader; class BestNameFinder; }
+namespace impl { class IntermediateResult; struct FeatureLoader; class BestNameFinder; }
 
 class Query
 {
diff --git a/storage/storage.cpp b/storage/storage.cpp
index a8d6f99309..4c8720835d 100644
--- a/storage/storage.cpp
+++ b/storage/storage.cpp
@@ -21,28 +21,28 @@ namespace storage
 {
   const int TIndex::INVALID = -1;
 
-  static string ErrorString(DownloadResultT res)
-  {
-    switch (res)
-    {
-    case EHttpDownloadCantCreateFile:
-      return "File can't be created. Probably, you have no disk space available or "
-                         "using read-only file system.";
-    case EHttpDownloadFailed:
-      return "Download failed due to missing or poor connection. "
-                         "Please, try again later.";
-    case EHttpDownloadFileIsLocked:
-      return "Download can't be finished because file is locked. "
-                         "Please, try again after restarting application.";
-    case EHttpDownloadFileNotFound:
-      return "Requested file is absent on the server.";
-    case EHttpDownloadNoConnectionAvailable:
-      return "No network connection is available.";
-    case EHttpDownloadOk:
-      return "Download finished successfully.";
-    }
-    return "Unknown error";
-  }
+//  static string ErrorString(DownloadResultT res)
+//  {
+//    switch (res)
+//    {
+//    case EHttpDownloadCantCreateFile:
+//      return "File can't be created. Probably, you have no disk space available or "
+//                         "using read-only file system.";
+//    case EHttpDownloadFailed:
+//      return "Download failed due to missing or poor connection. "
+//                         "Please, try again later.";
+//    case EHttpDownloadFileIsLocked:
+//      return "Download can't be finished because file is locked. "
+//                         "Please, try again after restarting application.";
+//    case EHttpDownloadFileNotFound:
+//      return "Requested file is absent on the server.";
+//    case EHttpDownloadNoConnectionAvailable:
+//      return "No network connection is available.";
+//    case EHttpDownloadOk:
+//      return "Download finished successfully.";
+//    }
+//    return "Unknown error";
+//  }
 
   ////////////////////////////////////////////////////////////////////////////
   void Storage::Init(TAddMapFunction addFunc, TRemoveMapFunction removeFunc, TUpdateRectFunction updateRectFunc, TEnumMapsFunction enumMapsFunc)
diff --git a/yg/renderer.hpp b/yg/renderer.hpp
index 66ff959fbc..9de45ddec2 100644
--- a/yg/renderer.hpp
+++ b/yg/renderer.hpp
@@ -18,6 +18,7 @@ namespace yg
     class Renderer
     {
     public:
+      virtual ~Renderer() {}
 
       struct Params
       {