4 files changed, 7 insertions, 7 deletions
diff --git a/source/components/parser/psargs.c b/source/components/parser/psargs.c
index 0e0b1002daef..c9c173717e38 100644
--- a/source/components/parser/psargs.c
+++ b/source/components/parser/psargs.c
@@ -1067,10 +1067,9 @@ AcpiPsGetNextArg (
     case ARGP_DATAOBJ:
     case ARGP_TERMARG:
 
-
-    ACPI_DEBUG_PRINT ((ACPI_DB_PARSE,
-        "**** TermArg/DataObj: %s (%2.2X)\n",
-        AcpiUtGetArgumentTypeName (ArgType), ArgType));
+        ACPI_DEBUG_PRINT ((ACPI_DB_PARSE,
+            "**** TermArg/DataObj: %s (%2.2X)\n",
+            AcpiUtGetArgumentTypeName (ArgType), ArgType));
 
         /* Single complex argument, nothing returned */
 
diff --git a/source/components/parser/psloop.c b/source/components/parser/psloop.c
index fd868f50f769..74e8f0d6ebda 100644
--- a/source/components/parser/psloop.c
+++ b/source/components/parser/psloop.c
@@ -283,7 +283,7 @@ AcpiPsGetArguments (
         }
 
         ACPI_DEBUG_PRINT ((ACPI_DB_PARSE,
-            "Final argument count: %u pass %u\n",
+            "Final argument count: %8.8X pass %u\n",
             WalkState->ArgCount, WalkState->PassNumber));
 
         /*
@@ -697,7 +697,7 @@ AcpiPsParseLoop (
         /* Check for arguments that need to be processed */
 
         ACPI_DEBUG_PRINT ((ACPI_DB_PARSE,
-            "Parseloop: argument count: %u\n", WalkState->ArgCount));
+            "Parseloop: argument count: %8.8X\n", WalkState->ArgCount));
 
         if (WalkState->ArgCount)
         {
diff --git a/source/components/parser/psparse.c b/source/components/parser/psparse.c
index ce7ae94a8b28..0ad62b771bef 100644
--- a/source/components/parser/psparse.c
+++ b/source/components/parser/psparse.c
@@ -576,7 +576,7 @@ AcpiPsParseAml (
 
     if (!WalkState->ParserState.Aml)
     {
-        return_ACPI_STATUS (AE_NULL_OBJECT);
+        return_ACPI_STATUS (AE_BAD_ADDRESS);
     }
 
     /* Create and initialize a new thread state */
diff --git a/source/components/parser/pstree.c b/source/components/parser/pstree.c
index da1d222d0876..baed92560d44 100644
--- a/source/components/parser/pstree.c
+++ b/source/components/parser/pstree.c
@@ -438,6 +438,7 @@ AcpiPsGetChild (
 
     case AML_BUFFER_OP:
     case AML_PACKAGE_OP:
+    case AML_VARIABLE_PACKAGE_OP:
     case AML_METHOD_OP:
     case AML_IF_OP:
     case AML_WHILE_OP: