diff --git a/base/applications/msconfig_new/srvpage.cpp b/base/applications/msconfig_new/srvpage.cpp
index 816382482b6..c19e075a73d 100644
--- a/base/applications/msconfig_new/srvpage.cpp
+++ b/base/applications/msconfig_new/srvpage.cpp
@@ -582,7 +582,7 @@ static BOOL ValidateItem(int index, BOOL bNewState, BOOL bDisplayErrors)
 
 
 static void
-Update_Btn_States(HWND hDlg)
+UpdateBtnStates(HWND hDlg)
 {
     // HWND hTree = GetDlgItem(hDlg, IDC_SYSTEM_TREE);
 
@@ -714,7 +714,7 @@ ServicesPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
             //
             GetServices();
             ListView_Sort(hServicesListCtrl, 0);
-            Update_Btn_States(hDlg);
+            UpdateBtnStates(hDlg);
 
             // Select the first item.
             ListView_SetItemState(hServicesListCtrl, 0, LVIS_SELECTED, LVIS_SELECTED);
@@ -745,7 +745,7 @@ ServicesPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
 
                     if (bAreThereMods)
                     {
-                        Update_Btn_States(hDlg);
+                        UpdateBtnStates(hDlg);
                         PropSheet_Changed(GetParent(hServicesPage), hServicesPage);
                     }
 
@@ -764,7 +764,7 @@ ServicesPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
 
                     if (bAreThereMods)
                     {
-                        Update_Btn_States(hDlg);
+                        UpdateBtnStates(hDlg);
                         PropSheet_Changed(GetParent(hServicesPage), hServicesPage);
                     }
 
@@ -775,7 +775,7 @@ ServicesPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
                 {
                     bMaskProprietarySvcs = !bMaskProprietarySvcs;
                     GetServices(bMaskProprietarySvcs);
-                    Update_Btn_States(hDlg);
+                    UpdateBtnStates(hDlg);
 
                     return TRUE;
                 }
@@ -792,7 +792,7 @@ ServicesPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
 
             if (ValidateItem(/*reinterpret_cast<int>*/ int(lParam), bNewCheckState, !HideEssentialServiceWarning()))
             {
-                Update_Btn_States(hDlg);
+                UpdateBtnStates(hDlg);
                 PropSheet_Changed(GetParent(hServicesPage), hServicesPage);
             }
 
@@ -1058,7 +1058,7 @@ ServicesPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
                         }
 
                         GetServices(bMaskProprietarySvcs);
-                        Update_Btn_States(hDlg);
+                        UpdateBtnStates(hDlg);
 
                         return TRUE;
                     }
diff --git a/base/applications/msconfig_new/toolspage.cpp b/base/applications/msconfig_new/toolspage.cpp
index fcf3e4a65d3..6a6f090e0fb 100644
--- a/base/applications/msconfig_new/toolspage.cpp
+++ b/base/applications/msconfig_new/toolspage.cpp
@@ -15,7 +15,7 @@
 
 static HWND hToolsPage     = NULL;
 static HWND hToolsListCtrl = NULL;
-static int  iSortedColumn  = 0;
+static int  iToolsPageSortedColumn  = 0;
 
 struct TOOL
 {
@@ -442,8 +442,8 @@ ToolsPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
                     {
                         int iSortingColumn = ((LPNMLISTVIEW)lParam)->iSubItem;
 
-                        ListView_SortEx(hToolsListCtrl, iSortingColumn, iSortedColumn);
-                        iSortedColumn = iSortingColumn;
+                        ListView_SortEx(hToolsListCtrl, iSortingColumn, iToolsPageSortedColumn);
+                        iToolsPageSortedColumn = iSortingColumn;
 
                         return TRUE;
                     }
diff --git a/base/applications/msconfig_new/xmldomparser.hpp b/base/applications/msconfig_new/xmldomparser.hpp
index 73528dfb934..8a6df70006f 100644
--- a/base/applications/msconfig_new/xmldomparser.hpp
+++ b/base/applications/msconfig_new/xmldomparser.hpp
@@ -6,6 +6,8 @@
  * COPYRIGHT:   Copyright 2011-2012 Hermes BELUSCA - MAITO <hermes.belusca@sfr.fr>
  */
 
+#pragma once
+
 /*
  *
  * MSXML Version    Header File Name    Library File Name    DLL File Name