Index: src/engine/Main.cpp
===================================================================
--- a/src/engine/Main.cpp
+++ b/src/engine/Main.cpp
@@ -53,14 +53,14 @@
     {
       std::wstring upToDateText = dictionary->Lookup("updater", "update-already-up-to-date-text");
       std::wstring upToDateTitle = dictionary->Lookup("updater", "update-already-up-to-date-title");
-      MessageBox(NULL, upToDateText.c_str(), upToDateTitle.c_str(), MB_OK);
+      MessageBoxW(NULL, upToDateText.c_str(), upToDateTitle.c_str(), MB_OK);
     }
     else
     {
       std::wstring errorText = dictionary->Lookup("updater", "update-error-text");
       std::wstring errorTitle = dictionary->Lookup("updater", "update-error-title");
       ReplaceString(errorText, L"?1?", ToUtf16String(res));
-      MessageBox(NULL, errorText.c_str(), errorTitle.c_str(), MB_OK);
+      MessageBoxW(NULL, errorText.c_str(), errorTitle.c_str(), MB_OK);
     }
     return;
   }
Index: src/plugin/PluginSettings.cpp
===================================================================
--- a/src/plugin/PluginSettings.cpp
+++ b/src/plugin/PluginSettings.cpp
@@ -153,14 +153,14 @@
 }
 
 
-std::map<CString, CString> CPluginSettings::GetFilterLanguageTitleList()
+std::map<CString, CString> CPluginSettings::GetFilterLanguageTitleList() const
 {
-  m_subscriptions = CPluginClient::GetInstance()->FetchAvailableSubscriptions();
+  std::vector<SubscriptionDescription> subscriptions = CPluginClient::GetInstance()->FetchAvailableSubscriptions();
 
   std::map<CString, CString> filterList;
-  for (size_t i = 0; i < m_subscriptions.size(); i ++)
+  for (size_t i = 0; i < subscriptions.size(); i ++)
   {
-    SubscriptionDescription it = m_subscriptions[i];
+    SubscriptionDescription it = subscriptions[i];
     filterList.insert(std::make_pair(CString(it.url.c_str()), CString(it.title.c_str())));
   }
   return filterList;
Index: src/plugin/PluginSettings.h
===================================================================
--- a/src/plugin/PluginSettings.h
+++ b/src/plugin/PluginSettings.h
@@ -78,7 +78,7 @@
 
   bool IsPluginEnabled() const;
 
-  std::map<CString, CString> GetFilterLanguageTitleList();
+  std::map<CString, CString> GetFilterLanguageTitleList() const;
 
   void SetWorkingThreadId();
   void SetWorkingThreadId(DWORD id);
@@ -118,7 +118,6 @@
   CString GetSubscription();
   CString GetAppLocale();
   CString GetDocumentationLink();
-  std::vector<SubscriptionDescription> m_subscriptions;
 };
 
 
Index: src/plugin/PluginTabBase.cpp
===================================================================
--- a/src/plugin/PluginTabBase.cpp
+++ b/src/plugin/PluginTabBase.cpp
@@ -83,11 +83,11 @@
   m_isActivated = true;
 }
 
-DWORD WINAPI FilterLoader(void* thisPtrVoid)
+DWORD WINAPI FilterLoader(LPVOID threadParam)
 {
-  CPluginTabBase* thisPtr = (CPluginTabBase*)thisPtrVoid;
-  thisPtr->m_filter->LoadHideFilters(CPluginClient::GetInstance()->GetElementHidingSelectors(thisPtr->GetDocumentDomain().GetString()));
-  SetEvent(thisPtr->m_filter->hideFiltersLoadedEvent);
+  CPluginTabBase* tabBase = (CPluginTabBase*)threadParam;
+  tabBase->m_filter->LoadHideFilters(CPluginClient::GetInstance()->GetElementHidingSelectors(tabBase->GetDocumentDomain().GetString()));
+  SetEvent(tabBase->m_filter->hideFiltersLoadedEvent);
   return 0;
 }
 
Index: src/shared/Communication.h
===================================================================
--- a/src/shared/Communication.h
+++ b/src/shared/Communication.h
@@ -28,7 +28,6 @@
     PROC_GET_PREF,
     PROC_IS_FIRST_RUN_ACTION_NEEDED,
     PROC_CHECK_FOR_UPDATES,
-    PROC_GET_APP_LOCALE,
     PROC_GET_DOCUMENTATION_LINK,
     PROC_TOGGLE_PLUGIN_ENABLED
   };