diff --git a/source/components/debugger/dbexec.c b/source/components/debugger/dbexec.c
index 1831cba60..56fb649c9 100644
--- a/source/components/debugger/dbexec.c
+++ b/source/components/debugger/dbexec.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
  *
  * Module Name: dbexec - debugger control method execution
- *              $Revision: 1.70 $
+ *              $Revision: 1.71 $
  *
  ******************************************************************************/
 
@@ -505,13 +505,6 @@ AcpiDbMethodThread (
 
     for (i = 0; i < Info->NumLoops; i++)
     {
-#if 0
-       if (i == 0xEFDC)
-        {
-            AcpiDbgLevel = 0x00FFFFFF;
-        }
-#endif
-
         Status = AcpiDbExecuteMethod (Info, &ReturnObj);
         if (ACPI_FAILURE (Status))
         {
@@ -543,7 +536,8 @@ AcpiDbMethodThread (
     Status = AcpiOsSignalSemaphore (Info->ThreadGate, 1);
     if (ACPI_FAILURE (Status))
     {
-        AcpiOsPrintf ("Could not signal debugger semaphore\n");
+        AcpiOsPrintf ("Could not signal debugger thread sync semaphore, %s\n",
+            AcpiFormatException (Status));
     }
 }
 
diff --git a/source/components/namespace/nsaccess.c b/source/components/namespace/nsaccess.c
index d6c5ca0ae..9388c6eb9 100644
--- a/source/components/namespace/nsaccess.c
+++ b/source/components/namespace/nsaccess.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
  *
  * Module Name: nsaccess - Top-level functions for accessing ACPI namespace
- *              $Revision: 1.192 $
+ *              $Revision: 1.193 $
  *
  ******************************************************************************/
 
@@ -462,9 +462,9 @@ AcpiNsLookup (
     {
         /* A Null NamePath is allowed and refers to the root */
 
-        NumSegments  = 0;
-        ThisNode     = AcpiGbl_RootNode;
-        Path     = "";
+        NumSegments = 0;
+        ThisNode = AcpiGbl_RootNode;
+        Path = "";
 
         ACPI_DEBUG_PRINT ((ACPI_DB_NAMES,
             "Null Pathname (Zero segments), Flags=%X\n", Flags));
@@ -696,13 +696,13 @@ AcpiNsLookup (
          *
          * Then we have a type mismatch.  Just warn and ignore it.
          */
-        if ((NumSegments        == 0)                               &&
-            (TypeToCheckFor     != ACPI_TYPE_ANY)                   &&
-            (TypeToCheckFor     != ACPI_TYPE_LOCAL_ALIAS)           &&
-            (TypeToCheckFor     != ACPI_TYPE_LOCAL_METHOD_ALIAS)    &&
-            (TypeToCheckFor     != ACPI_TYPE_LOCAL_SCOPE)           &&
-            (ThisNode->Type     != ACPI_TYPE_ANY)                   &&
-            (ThisNode->Type     != TypeToCheckFor))
+        if ((NumSegments == 0)                                  &&
+            (TypeToCheckFor != ACPI_TYPE_ANY)                   &&
+            (TypeToCheckFor != ACPI_TYPE_LOCAL_ALIAS)           &&
+            (TypeToCheckFor != ACPI_TYPE_LOCAL_METHOD_ALIAS)    &&
+            (TypeToCheckFor != ACPI_TYPE_LOCAL_SCOPE)           &&
+            (ThisNode->Type != ACPI_TYPE_ANY)                   &&
+            (ThisNode->Type != TypeToCheckFor))
         {
             /* Complain about a type mismatch */
 
diff --git a/source/components/utilities/utglobal.c b/source/components/utilities/utglobal.c
index 6307b2bfb..5336055b1 100644
--- a/source/components/utilities/utglobal.c
+++ b/source/components/utilities/utglobal.c
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Module Name: utglobal - Global variables for the ACPI subsystem
- *              $Revision: 1.217 $
+ *              $Revision: 1.218 $
  *
  *****************************************************************************/
 
@@ -697,7 +697,7 @@ AcpiUtGetNodeName (
 
     /* Name must be a valid ACPI name */
 
-    if (!AcpiUtValidAcpiName (ACPI_GET32 (Node->Name.Ascii)))
+    if (!AcpiUtValidAcpiName (Node->Name.Integer))
     {
         return ("????");
     }
@@ -927,7 +927,6 @@ AcpiUtInitGlobals (
     /* Namespace */
 
     AcpiGbl_RootNode                    = NULL;
-
     AcpiGbl_RootNodeStruct.Name.Integer = ACPI_ROOT_NAME;
     AcpiGbl_RootNodeStruct.Descriptor   = ACPI_DESC_TYPE_NAMED;
     AcpiGbl_RootNodeStruct.Type         = ACPI_TYPE_DEVICE;