diff --git a/os/src/drivers/acpi/README b/os/src/drivers/acpi/README
index 42d149f90..b58f6ce1b 100644
--- a/os/src/drivers/acpi/README
+++ b/os/src/drivers/acpi/README
@@ -17,7 +17,7 @@ Start the 'acpi_drv' in your Genode environment. Do not start the 'pci_drv'
 since this will be used as a slave of the 'acpi_drv'. You still must load the
 'pci_drv' in your boot loader.
 
-Configuration snipped (please not that IRQ service requests of the 'timer' are
+Configuration snipped (please note that IRQ service requests of the 'timer' are
 routed to the ACPI-driver):
 
 !<start name="acpi">
diff --git a/os/src/drivers/acpi/acpi.cc b/os/src/drivers/acpi/acpi.cc
index 7427cc7d8..6f4970ee9 100644
--- a/os/src/drivers/acpi/acpi.cc
+++ b/os/src/drivers/acpi/acpi.cc
@@ -66,9 +66,9 @@ struct Generic
 	uint8_t const *data() { return reinterpret_cast<uint8_t *>(this); }
 
 	/* MADT acpi structures */
-	Apic_struct *apic_struct() { return reinterpret_cast<Apic_struct *>(&creator_rev + 8); }
+	Apic_struct *apic_struct() { return reinterpret_cast<Apic_struct *>(&creator_rev + 3); }
 	Apic_struct *end()         { return reinterpret_cast<Apic_struct *>(signature + size); }
-};
+} __attribute__((packed));
 
 
 /**
diff --git a/os/src/drivers/acpi/main.cc b/os/src/drivers/acpi/main.cc
index e99a40c81..61f63e8f9 100644
--- a/os/src/drivers/acpi/main.cc
+++ b/os/src/drivers/acpi/main.cc
@@ -54,27 +54,12 @@ namespace Irq {
 				/* check for 'MADT' overrides */
 				irq_number = Acpi::override(irq_number);
 
-				/* qouta handling */
-				size_t ram_quota = Arg_string::find_arg(args.string(), "ram_quota").long_value(0);
-				size_t old_quota = 0, new_quota = 0;
-				Session_capability cap;
-
 				/* allocate IRQ at parent*/
 				try {
-					old_quota = env()->ram_session()->quota();
 					Irq_connection irq(irq_number);
-					new_quota = env()->ram_session()->quota();
 					irq.on_destruction(Irq_connection::KEEP_OPEN);
-					cap = irq.cap();
+					return irq.cap();
 				} catch (...) { throw Root::Unavailable(); }
-
-				/* check used quota against quota provided */
-				if (old_quota > new_quota && (old_quota - new_quota) > ram_quota) { 
-					close(cap);
-					throw Root::Quota_exceeded();
-				}
-
-				return cap;
 			}
 
 			/**