diff --git a/reactos/base/applications/mscutils/servman/create.c b/reactos/base/applications/mscutils/servman/create.c
index 3f4ed747e15..2042901d62a 100644
--- a/reactos/base/applications/mscutils/servman/create.c
+++ b/reactos/base/applications/mscutils/servman/create.c
@@ -65,9 +65,7 @@ DoCreate(PCREATE_DATA Data)
             {
                 DisplayString(lpSuccess);
 
-                HeapFree(ProcessHeap,
-                         0,
-                         lpSuccess);
+                LocalFree(lpSuccess);
             }
 
             CloseServiceHandle(hSc);
diff --git a/reactos/base/applications/mscutils/servman/delete.c b/reactos/base/applications/mscutils/servman/delete.c
index c17a49d7a47..b041c15b73e 100644
--- a/reactos/base/applications/mscutils/servman/delete.c
+++ b/reactos/base/applications/mscutils/servman/delete.c
@@ -38,9 +38,7 @@ DoDeleteService(PMAIN_WND_INFO Info,
                 {
                     DisplayString(lpSuccess);
 
-                    HeapFree(ProcessHeap,
-                             0,
-                             lpSuccess);
+                    LocalFree(lpSuccess);
                 }
 
                 bRet = TRUE;
diff --git a/reactos/base/applications/mscutils/servman/dependencies_tv1.c b/reactos/base/applications/mscutils/servman/dependencies_tv1.c
index 9c686e252b1..1c6918a36b9 100644
--- a/reactos/base/applications/mscutils/servman/dependencies_tv1.c
+++ b/reactos/base/applications/mscutils/servman/dependencies_tv1.c
@@ -163,9 +163,7 @@ TV1_AddDependantsToTree(PSERVICEPROPSHEET pDlgInfo,
                                       0,
                                       FALSE);
 
-                    HeapFree(ProcessHeap,
-                             0,
-                             lpNoDepends);
+                    LocalFree(lpNoDepends);
 
                     /* Disable the window */
                     EnableWindow(pDlgInfo->hDependsTreeView1, FALSE);
diff --git a/reactos/base/applications/mscutils/servman/dependencies_tv2.c b/reactos/base/applications/mscutils/servman/dependencies_tv2.c
index d8ddc0e5783..3e2351eb779 100644
--- a/reactos/base/applications/mscutils/servman/dependencies_tv2.c
+++ b/reactos/base/applications/mscutils/servman/dependencies_tv2.c
@@ -41,6 +41,8 @@ TV2_HasDependantServices(LPWSTR lpServiceName)
                      bRet = TRUE;
                  }
             }
+
+            CloseServiceHandle(hService);
         }
 
         CloseServiceHandle(hSCManager);
@@ -163,9 +165,7 @@ TV2_AddDependantsToTree(PSERVICEPROPSHEET pDlgInfo,
                               0,
                               FALSE);
 
-            HeapFree(ProcessHeap,
-                     0,
-                     lpNoDepends);
+            LocalFree(lpNoDepends);
 
             /* Disable the window */
             EnableWindow(pDlgInfo->hDependsTreeView2, FALSE);
diff --git a/reactos/base/applications/mscutils/servman/listview.c b/reactos/base/applications/mscutils/servman/listview.c
index 14523d8f788..48f4c130677 100644
--- a/reactos/base/applications/mscutils/servman/listview.c
+++ b/reactos/base/applications/mscutils/servman/listview.c
@@ -192,9 +192,7 @@ ChangeListViewText(PMAIN_WND_INFO Info,
                             lvItem.iItem,
                             (LPARAM)&lvItem);
 
-                HeapFree(ProcessHeap,
-                         0,
-                         lpStartup);
+                LocalFree(lpStartup);
                 HeapFree(ProcessHeap,
                          0,
                          lpServiceConfig);
diff --git a/reactos/base/applications/mscutils/servman/stop_dependencies.c b/reactos/base/applications/mscutils/servman/stop_dependencies.c
index 941b0ad9c83..5ef227663f6 100644
--- a/reactos/base/applications/mscutils/servman/stop_dependencies.c
+++ b/reactos/base/applications/mscutils/servman/stop_dependencies.c
@@ -238,9 +238,7 @@ DoInitDependsDialog(PMAIN_WND_INFO pInfo,
                 bRet = TRUE;
             }
 
-            HeapFree(ProcessHeap,
-                     0,
-                     lpPartialStr);
+            LocalFree(lpPartialStr);
         }
 
         /* Display the list of services which need stopping */