diff --git a/int-format.patch b/int-format.patch
index 74a5cc1..271e023 100644
--- a/int-format.patch
+++ b/int-format.patch
@@ -22,9 +22,9 @@ diff -Naur acpica-unix2-20150204.orig/source/tools/acpiexec/aemain.c acpica-unix
                  (UINT32) strlen (AcpiGbl_Optarg), (AE_BUFFER_SIZE -1));
              return (-1);
          }
-diff -Naur acpica-unix2-20150204/source/compiler/aslerror.c acpica-unix2-20150204.new/source/compiler/aslerror.c
---- acpica-unix2-20150204/source/compiler/aslerror.c	2015-02-04 14:12:18.000000000 -0700
-+++ acpica-unix2-20150204.new/source/compiler/aslerror.c	2015-03-02 19:01:35.880311085 -0700
+diff -Naur acpica-unix2-20150204.orig/source/compiler/aslerror.c acpica-unix2-20150204/source/compiler/aslerror.c
+--- acpica-unix2-20150204.orig/source/compiler/aslerror.c	2015-02-04 14:12:18.000000000 -0700
++++ acpica-unix2-20150204/source/compiler/aslerror.c	2015-03-02 19:01:35.880311085 -0700
 @@ -685,7 +685,7 @@
      Gbl_ExceptionCount[Level]++;
      if (Gbl_ExceptionCount[ASL_ERROR] > ASL_MAX_ERROR_COUNT)
@@ -34,15 +34,294 @@ diff -Naur acpica-unix2-20150204/source/compiler/aslerror.c acpica-unix2-2015020
  
          Gbl_SourceLine = 0;
          Gbl_NextError = Gbl_ErrorLog;
-diff -Naur acpica-unix2-20150204/source/components/debugger/dbexec.c acpica-unix2-20150204.new/source/components/debugger/dbexec.c
---- acpica-unix2-20150204/source/components/debugger/dbexec.c	2015-02-04 14:12:19.000000000 -0700
-+++ acpica-unix2-20150204.new/source/components/debugger/dbexec.c	2015-03-02 19:03:54.240975631 -0700
+@@ -731,7 +731,7 @@
+ 
+     if (Gbl_DisabledMessagesIndex >= ASL_MAX_DISABLED_MESSAGES)
+     {
+-        printf ("Too many messages have been disabled (max %u)\n",
++        printf ("Too many messages have been disabled (max %d)\n",
+             ASL_MAX_DISABLED_MESSAGES);
+         return (AE_LIMIT);
+     }
+diff -Naur acpica-unix2-20150204.orig/source/components/debugger/dbexec.c acpica-unix2-20150204/source/components/debugger/dbexec.c
+--- acpica-unix2-20150204.orig/source/components/debugger/dbexec.c	2015-02-04 14:12:19.000000000 -0700
++++ acpica-unix2-20150204/source/components/debugger/dbexec.c	2015-03-02 19:03:54.240975631 -0700
 @@ -214,7 +214,7 @@
          {
              ACPI_ERROR ((AE_INFO,
                  "Possible overflow of internal debugger buffer (size 0x%X needed 0x%X)",
 -                ACPI_DEBUG_BUFFER_SIZE, (UINT32) ReturnObj->Length));
-+                ACPI_DEBUG_BUFFER_SIZE, (unsigned int) ReturnObj->Length));
++                (UINT32) ACPI_DEBUG_BUFFER_SIZE, (UINT32) ReturnObj->Length));
+         }
+     }
+ 
+diff -Naur acpica-unix2-20150204.orig/source/compiler/aslopt.c acpica-unix2-20150204/source/compiler/aslopt.c
+--- acpica-unix2-20150204.orig/source/compiler/aslopt.c	2015-02-04 14:12:18.000000000 -0700
++++ acpica-unix2-20150204/source/compiler/aslopt.c	2015-03-03 17:49:35.616964598 -0700
+@@ -576,7 +576,7 @@
+     }
+ 
+     ACPI_DEBUG_PRINT_RAW ((ACPI_DB_OPTIMIZATIONS,
+-        "PATH OPTIMIZE: Line %5d ParentOp [%12.12s] ThisOp [%12.12s] ",
++        "PATH OPTIMIZE: Line %5u ParentOp [%12.12s] ThisOp [%12.12s] ",
+         Op->Asl.LogicalLineNumber,
+         AcpiPsGetOpcodeName (Op->Common.Parent->Common.AmlOpcode),
+         AcpiPsGetOpcodeName (Op->Common.AmlOpcode)));
+diff -Naur acpica-unix2-20150204.orig/source/components/dispatcher/dsmthdat.c acpica-unix2-20150204/source/components/dispatcher/dsmthdat.c
+--- acpica-unix2-20150204.orig/source/components/dispatcher/dsmthdat.c	2015-02-04 14:12:19.000000000 -0700
++++ acpica-unix2-20150204/source/components/dispatcher/dsmthdat.c	2015-03-03 17:50:38.719711924 -0700
+@@ -287,7 +287,7 @@
+         if (Index > ACPI_METHOD_MAX_LOCAL)
+         {
+             ACPI_ERROR ((AE_INFO,
+-                "Local index %u is invalid (max %u)",
++                "Local index %u is invalid (max %d)",
+                 Index, ACPI_METHOD_MAX_LOCAL));
+             return_ACPI_STATUS (AE_AML_INVALID_INDEX);
+         }
+@@ -302,7 +302,7 @@
+         if (Index > ACPI_METHOD_MAX_ARG)
+         {
+             ACPI_ERROR ((AE_INFO,
+-                "Arg index %u is invalid (max %u)",
++                "Arg index %u is invalid (max %d)",
+                 Index, ACPI_METHOD_MAX_ARG));
+             return_ACPI_STATUS (AE_AML_INVALID_INDEX);
          }
+diff -Naur acpica-unix2-20150204.orig/source/compiler/aslpredef.c acpica-unix2-20150204/source/compiler/aslpredef.c
+--- acpica-unix2-20150204.orig/source/compiler/aslpredef.c	2015-02-04 14:12:18.000000000 -0700
++++ acpica-unix2-20150204/source/compiler/aslpredef.c	2015-03-03 18:13:02.317600741 -0700
+@@ -114,7 +114,7 @@
+ 
+         if (MethodInfo->NumArguments != 0)
+         {
+-            sprintf (MsgBuffer, "%s requires %u", Op->Asl.ExternalName, 0);
++            sprintf (MsgBuffer, "%s requires %d", Op->Asl.ExternalName, 0);
+ 
+             AslError (ASL_WARNING, ASL_MSG_RESERVED_ARG_COUNT_HI, Op,
+                 MsgBuffer);
+diff -Naur acpica-unix2-20150204.orig/source/compiler/aslprepkg.c acpica-unix2-20150204/source/compiler/aslprepkg.c
+--- acpica-unix2-20150204.orig/source/compiler/aslprepkg.c	2015-02-04 14:12:18.000000000 -0700
++++ acpica-unix2-20150204/source/compiler/aslprepkg.c	2015-03-03 18:31:00.963530037 -0700
+@@ -297,7 +297,7 @@
+ 
+         if (Count & 1)
+         {
+-            sprintf (MsgBuffer, "%4.4s: Package length, %d, must be even.",
++            sprintf (MsgBuffer, "%4.4s: Package length, %u, must be even.",
+                 Predefined->Info.Name, Count);
+ 
+             AslError (ASL_ERROR, ASL_MSG_RESERVED_PACKAGE_LENGTH,
+diff -Naur acpica-unix2-20150204.orig/source/compiler/aslutils.c acpica-unix2-20150204/source/compiler/aslutils.c
+--- acpica-unix2-20150204.orig/source/compiler/aslutils.c	2015-02-04 14:12:18.000000000 -0700
++++ acpica-unix2-20150204/source/compiler/aslutils.c	2015-03-04 12:03:36.567992558 -0700
+@@ -77,7 +77,7 @@
+  *
+  ******************************************************************************/
+ 
+-#define ACPI_TABLE_HELP_FORMAT  "%8u) %s    %s\n"
++#define ACPI_TABLE_HELP_FORMAT  "%8d) %s    %s\n"
+ 
+ void
+ UtDisplaySupportedTables (
+@@ -89,7 +89,7 @@
+ 
+     printf ("\nACPI tables supported by iASL version %8.8X:\n"
+         "  (Compiler, Disassembler, Template Generator)\n\n",
+-        ACPI_CA_VERSION);
++        (UINT32) ACPI_CA_VERSION);
+ 
+     /* Special tables */
+ 
+@@ -104,7 +104,7 @@
+     printf ("\n  Standard ACPI data tables:\n");
+     for (TableData = AcpiDmTableData, i = 5; TableData->Signature; TableData++, i++)
+     {
+-        printf (ACPI_TABLE_HELP_FORMAT, i, TableData->Signature, TableData->Name);
++        printf (ACPI_TABLE_HELP_FORMAT, (int) i, TableData->Signature, TableData->Name);
+     }
+ }
+ 
+diff -Naur acpica-unix2-20150204.orig/source/components/dispatcher/dsutils.c acpica-unix2-20150204/source/components/dispatcher/dsutils.c
+--- acpica-unix2-20150204.orig/source/components/dispatcher/dsutils.c	2015-02-04 14:12:19.000000000 -0700
++++ acpica-unix2-20150204/source/components/dispatcher/dsutils.c	2015-03-04 12:05:14.938088002 -0700
+@@ -778,7 +778,7 @@
+     }
+ 
+     ACPI_DEBUG_PRINT ((ACPI_DB_DISPATCH,
+-        "NumOperands %d, ArgCount %d, Index %d\n",
++        "NumOperands %d, ArgCount %u, Index %u\n",
+         WalkState->NumOperands, ArgCount, Index));
+ 
+     /* Create the interpreter arguments, in reverse order */
+diff -Naur acpica-unix2-20150204.orig/source/components/dispatcher/dswscope.c acpica-unix2-20150204/source/components/dispatcher/dswscope.c
+--- acpica-unix2-20150204.orig/source/components/dispatcher/dswscope.c	2015-02-04 14:12:19.000000000 -0700
++++ acpica-unix2-20150204/source/components/dispatcher/dswscope.c	2015-03-04 16:00:57.493157707 -0700
+@@ -148,7 +148,7 @@
+     WalkState->ScopeDepth++;
+ 
+     ACPI_DEBUG_PRINT ((ACPI_DB_EXEC,
+-        "[%.2d] Pushed scope ", (UINT32) WalkState->ScopeDepth));
++        "[%.2d] Pushed scope ", WalkState->ScopeDepth));
+ 
+     OldScopeInfo = WalkState->ScopeInfo;
+     if (OldScopeInfo)
+@@ -211,7 +211,7 @@
+     WalkState->ScopeDepth--;
+ 
+     ACPI_DEBUG_PRINT ((ACPI_DB_EXEC,
+-        "[%.2d] Popped scope [%4.4s] (%s), New scope -> ",
++        "[%.2u] Popped scope [%4.4s] (%s), New scope -> ",
+         (UINT32) WalkState->ScopeDepth,
+         AcpiUtGetNodeName (ScopeInfo->Scope.Node),
+         AcpiUtGetTypeName (ScopeInfo->Common.Value)));
+diff -Naur acpica-unix2-20150204.orig/source/components/events/evgpe.c acpica-unix2-20150204/source/components/events/evgpe.c
+--- acpica-unix2-20150204.orig/source/components/events/evgpe.c	2015-03-05 12:47:00.454194174 -0700
++++ acpica-unix2-20150204/source/components/events/evgpe.c	2015-03-05 12:52:16.254562359 -0700
+@@ -429,7 +429,7 @@
+                     "Ignore disabled registers for GPE %02X-%02X: "
+                     "RunEnable=%02X, WakeEnable=%02X\n",
+                     GpeRegisterInfo->BaseGpeNumber,
+-                    GpeRegisterInfo->BaseGpeNumber + (ACPI_GPE_REGISTER_WIDTH - 1),
++                    (unsigned int) (GpeRegisterInfo->BaseGpeNumber + (ACPI_GPE_REGISTER_WIDTH - 1)),
+                     GpeRegisterInfo->EnableForRun,
+                     GpeRegisterInfo->EnableForWake));
+                 continue;
+@@ -455,7 +455,7 @@
+                 "Read registers for GPE %02X-%02X: Status=%02X, Enable=%02X, "
+                 "RunEnable=%02X, WakeEnable=%02X\n",
+                 GpeRegisterInfo->BaseGpeNumber,
+-                GpeRegisterInfo->BaseGpeNumber + (ACPI_GPE_REGISTER_WIDTH - 1),
++                (unsigned int) (GpeRegisterInfo->BaseGpeNumber + (ACPI_GPE_REGISTER_WIDTH - 1)),
+                 StatusReg, EnableReg,
+                 GpeRegisterInfo->EnableForRun,
+                 GpeRegisterInfo->EnableForWake));
+diff -Naur acpica-unix2-20150204.orig/source/components/executer/exdump.c acpica-unix2-20150204/source/components/executer/exdump.c
+--- acpica-unix2-20150204.orig/source/components/executer/exdump.c	2015-02-04 14:12:19.000000000 -0700
++++ acpica-unix2-20150204/source/components/executer/exdump.c	2015-03-05 12:49:52.556029735 -0700
+@@ -663,7 +663,7 @@
+     if (Depth > 0)
+     {
+         ACPI_DEBUG_PRINT ((ACPI_DB_EXEC, "%*s[%u] %p ",
+-            Depth, " ", Depth, ObjDesc));
++            (int) Depth, " ", Depth, ObjDesc));
+     }
+     else
+     {
+diff -Naur acpica-unix2-20150204.orig/source/components/executer/exnames.c acpica-unix2-20150204/source/components/executer/exnames.c
+--- acpica-unix2-20150204.orig/source/components/executer/exnames.c	2015-02-04 14:12:19.000000000 -0700
++++ acpica-unix2-20150204/source/components/executer/exnames.c	2015-03-05 13:17:52.054406156 -0700
+@@ -239,7 +239,7 @@
+          */
+         ACPI_DEBUG_PRINT ((ACPI_DB_INFO,
+             "Leading character is not alpha: %02Xh (not a name)\n",
+-            CharBuf[0]));
++            (unsigned int) CharBuf[0]));
+         Status = AE_CTRL_PENDING;
+     }
+     else
+@@ -251,7 +251,7 @@
+         Status = AE_AML_BAD_NAME;
+         ACPI_ERROR ((AE_INFO,
+             "Bad character 0x%02x in name, at %p",
+-            *AmlAddress, AmlAddress));
++            (unsigned int) (*AmlAddress), AmlAddress));
+     }
+ 
+     *InAmlAddress = ACPI_CAST_PTR (UINT8, AmlAddress);
+diff -Naur acpica-unix2-20150204.orig/source/components/executer/exfldio.c acpica-unix2-20150204/source/components/executer/exfldio.c
+--- acpica-unix2-20150204.orig/source/components/executer/exfldio.c	2015-02-04 14:12:19.000000000 -0700
++++ acpica-unix2-20150204/source/components/executer/exfldio.c	2015-03-05 16:18:34.233960417 -0700
+@@ -679,7 +679,7 @@
+ 
+             ACPI_ERROR ((AE_INFO,
+                 "Unknown UpdateRule value: 0x%X",
+-                (ObjDesc->CommonField.FieldFlags & AML_FIELD_UPDATE_RULE_MASK)));
++                (unsigned int) (ObjDesc->CommonField.FieldFlags & AML_FIELD_UPDATE_RULE_MASK)));
+             return_ACPI_STATUS (AE_AML_OPERAND_VALUE);
+         }
+     }
+diff -Naur acpica-unix2-20150204.orig/source/components/tables/tbfadt.c acpica-unix2-20150204/source/components/tables/tbfadt.c
+--- acpica-unix2-20150204.orig/source/components/tables/tbfadt.c	2015-02-04 14:12:20.000000000 -0700
++++ acpica-unix2-20150204/source/components/tables/tbfadt.c	2015-03-05 16:12:17.126680882 -0700
+@@ -233,7 +233,7 @@
+         if (!(Flags & ACPI_FADT_GPE_REGISTER))
+         {
+             ACPI_ERROR ((AE_INFO,
+-                "%s - 32-bit FADT register is too long (%u bytes, %u bits) "
++                "%s - 32-bit FADT register is too long (%u bytes, %d bits) "
+                 "to convert to GAS struct - 255 bits max, truncating",
+                 RegisterName, ByteWidth, (ByteWidth * 8)));
+         }
+@@ -304,7 +304,7 @@
+ 
+         ACPI_BIOS_WARNING ((AE_INFO,
+             "32/64X %s address mismatch in FADT: "
+-            "0x%8.8X/0x%8.8X%8.8X, using %u-bit address",
++            "0x%8.8X/0x%8.8X%8.8X, using %d-bit address",
+             RegisterName, Address32, ACPI_FORMAT_UINT64 (Address64),
+             AcpiGbl_Use32BitFadtAddresses ? 32 : 64));
+ 
+@@ -612,7 +612,7 @@
+ 
+                 ACPI_BIOS_WARNING ((AE_INFO,
+                     "32/64X address mismatch in FADT/%s: "
+-                    "0x%8.8X/0x%8.8X%8.8X, using %u-bit address",
++                    "0x%8.8X/0x%8.8X%8.8X, using %d-bit address",
+                     Name, Address32,
+                     ACPI_FORMAT_UINT64 (Address64->Address),
+                     AcpiGbl_Use32BitFadtAddresses ? 32 : 64));
+diff -Naur acpica-unix2-20150204.orig/source/components/hardware/hwregs.c acpica-unix2-20150204/source/components/hardware/hwregs.c
+--- acpica-unix2-20150204.orig/source/components/hardware/hwregs.c	2015-02-04 14:12:19.000000000 -0700
++++ acpica-unix2-20150204/source/components/hardware/hwregs.c	2015-03-05 16:46:17.157825532 -0700
+@@ -299,7 +299,7 @@
+ 
+ 
+     ACPI_DEBUG_PRINT ((ACPI_DB_IO, "About to write %04X to %8.8X%8.8X\n",
+-        ACPI_BITMASK_ALL_FIXED_STATUS,
++        (UINT32) ACPI_BITMASK_ALL_FIXED_STATUS,
+         ACPI_FORMAT_UINT64 (AcpiGbl_XPm1aStatus.Address)));
+ 
+     LockFlags = AcpiOsAcquireLock (AcpiGbl_HardwareLock);
+diff -Naur acpica-unix2-20150204.orig/source/components/tables/tbxfroot.c acpica-unix2-20150204/source/components/tables/tbxfroot.c
+--- acpica-unix2-20150204.orig/source/components/tables/tbxfroot.c	2015-02-04 14:12:20.000000000 -0700
++++ acpica-unix2-20150204/source/components/tables/tbxfroot.c	2015-03-05 17:08:45.001594511 -0700
+@@ -177,7 +177,7 @@
+     {
+         ACPI_ERROR ((AE_INFO,
+             "Could not map memory at 0x%8.8X for length %u",
+-            ACPI_EBDA_PTR_LOCATION, ACPI_EBDA_PTR_LENGTH));
++            (UINT32) ACPI_EBDA_PTR_LOCATION, (UINT32) ACPI_EBDA_PTR_LENGTH));
+ 
+         return_ACPI_STATUS (AE_NO_MEMORY);
+     }
+@@ -204,7 +204,7 @@
+         {
+             ACPI_ERROR ((AE_INFO,
+                 "Could not map memory at 0x%8.8X for length %u",
+-                PhysicalAddress, ACPI_EBDA_WINDOW_SIZE));
++                PhysicalAddress, (UINT32) ACPI_EBDA_WINDOW_SIZE));
+ 
+             return_ACPI_STATUS (AE_NO_MEMORY);
+         }
+@@ -234,7 +234,7 @@
+     {
+         ACPI_ERROR ((AE_INFO,
+             "Could not map memory at 0x%8.8X for length %u",
+-            ACPI_HI_RSDP_WINDOW_BASE, ACPI_HI_RSDP_WINDOW_SIZE));
++            (UINT32) ACPI_HI_RSDP_WINDOW_BASE, (UINT32) ACPI_HI_RSDP_WINDOW_SIZE));
+ 
+         return_ACPI_STATUS (AE_NO_MEMORY);
+     }
+diff -Naur acpica-unix2-20150204.orig/source/components/utilities/utownerid.c acpica-unix2-20150204/source/components/utilities/utownerid.c
+--- acpica-unix2-20150204.orig/source/components/utilities/utownerid.c	2015-02-04 14:12:20.000000000 -0700
++++ acpica-unix2-20150204/source/components/utilities/utownerid.c	2015-03-05 17:06:40.281055170 -0700
+@@ -230,7 +230,7 @@
+     else
+     {
+         ACPI_ERROR ((AE_INFO,
+-            "Release of non-allocated OwnerId: 0x%2.2X", OwnerId + 1));
++            "Release of non-allocated OwnerId: 0x%2.2X", (UINT32) OwnerId + 1));
      }
  
+     (void) AcpiUtReleaseMutex (ACPI_MTX_CACHES);