Index: trunk/i386/libsaio/acpi_patcher.c
===================================================================
--- trunk/i386/libsaio/acpi_patcher.c	(revision 2357)
+++ trunk/i386/libsaio/acpi_patcher.c	(revision 2358)
@@ -147,7 +147,7 @@
 			return tableAddr;
 		}
 		close (fd);
-		verbose("Couldn't allocate memory for table \n", dirspec);
+		printf("Couldn't allocate memory for table \n", dirspec);
 	}  
 	//printf("Couldn't find table %s\n", filename);
 	return NULL;
@@ -772,7 +772,7 @@
 
 		DBG("New @%x,%x\n",fadt_mod->DSDT,fadt_mod->X_DSDT);
 
-		DBG("FADT: Using custom DSDT!\n");
+		verbose("FADT: Using custom DSDT!\n");
 	}
 
 	// Correct the checksum
@@ -976,7 +976,7 @@
 					rsdt_entries[i-dropoffset+j]=(uint32_t)new_ssdt[j];
 				}
 
-				DBG("RSDT: Added %d SSDT table(s)\n", ssdt_count);
+				verbose("RSDT: Added %d SSDT table(s)\n", ssdt_count);
 
 			}
 
@@ -989,7 +989,7 @@
 			DBG("New checksum %d at %x\n", rsdt_mod->Checksum,rsdt_mod);
 		} else {
 			rsdp_mod->RsdtAddress=0;
-			verbose("RSDT not found or RSDT incorrect\n");
+			printf("RSDT not found or incorrect\n");
 		}
 
 		if (version) {
@@ -1043,7 +1043,7 @@
 							fadt->Length);
 
 						if (!fadt || (uint64_t)xsdt_entries[i] >= 0xffffffff || fadt->Length>0x10000) {
-							DBG("FADT incorrect or after 4GB. Dropping XSDT\n");
+							verbose("FADT incorrect or after 4GB. Dropping XSDT\n");
 							goto drop_xsdt;
 						}
 
@@ -1088,7 +1088,7 @@
 						xsdt_entries[i-dropoffset+j]=(uint32_t)new_ssdt[j];
 					}
 
-					DBG("Added %d SSDT table(s) into XSDT\n", ssdt_count);
+					verbose("Added %d SSDT table(s) into XSDT\n", ssdt_count);
 				}
 
 				// Correct the checksum of XSDT
@@ -1104,7 +1104,7 @@
 				 */
 
 				rsdp_mod->XsdtAddress=0xffffffffffffffffLL;
-				DBG("XSDT not found or XSDT incorrect\n");
+				verbose("XSDT not found or XSDT incorrect\n");
 			}
 		}
 
Index: trunk/i386/libsaio/aml_generator.c
===================================================================
--- trunk/i386/libsaio/aml_generator.c	(revision 2357)
+++ trunk/i386/libsaio/aml_generator.c	(revision 2358)
@@ -371,7 +371,7 @@
 
 	if (node) {
 		unsigned int offset = 0;
-		unsigned int len = strlen(StringBuf)+1;
+		unsigned int len = strlen(StringBuf);
 		node->Type = AML_CHUNK_BUFFER;
 		node->Length = (uint8_t)(len + 3);
 		node->Buffer = malloc (node->Length);
@@ -576,7 +576,7 @@
 			case AML_CHUNK_DEVICE:
 				offset = aml_write_byte(AML_CHUNK_OP, buffer, offset);
 				offset = aml_write_byte(node->Type, buffer, offset);
-				offset = aml_write_size(node->Size-3, buffer, offset);
+				offset = aml_write_size(node->Size-2, buffer, offset);
 				offset = aml_write_buffer(node->Buffer, node->Length, buffer, offset);
 				break;
 
Index: trunk/i386/libsaio/fake_efi.c
===================================================================
--- trunk/i386/libsaio/fake_efi.c	(revision 2357)
+++ trunk/i386/libsaio/fake_efi.c	(revision 2358)
@@ -630,14 +630,12 @@
 	DT__AddProperty(efiPlatformNode, SYSTEM_ID_PROP, UUID_LEN, (EFI_UINT32 *)Platform.UUID);
 
 	// Export SystemSerialNumber if present
-	if ((ret16=getSmbiosChar16("SMserial", &len)))
-	{
+	if ((ret16=getSmbiosChar16("SMserial", &len))) {
 		DT__AddProperty(efiPlatformNode, SYSTEM_SERIAL_PROP, len, ret16);
 	}
 
 	// Export Model if present
-	if ((ret16=getSmbiosChar16("SMproductname", &len)))
-	{
+	if ((ret16=getSmbiosChar16("SMproductname", &len))) {
 		DT__AddProperty(efiPlatformNode, MODEL_PROP, len, ret16);
 	}