diff --git a/os/run/ahci.run b/os/run/ahci.run
index 56d3ffc37..05c85958a 100644
--- a/os/run/ahci.run
+++ b/os/run/ahci.run
@@ -96,7 +96,7 @@ if { [file exists $disk_image] == 0 } then {
 run_genode_until "child exited with exit value 0.*\n" 10
 
 # pay only attention to the output of test-ahci
-grep_output {^\[init -> t}
+grep_output {^\[init -> test-ahci}
 
 compare_output_to {
 	[init -> test-ahci] --- AHCI block driver test ---
diff --git a/os/src/drivers/acpi/acpi.cc b/os/src/drivers/acpi/acpi.cc
index 49b890c08..e3a03d70e 100644
--- a/os/src/drivers/acpi/acpi.cc
+++ b/os/src/drivers/acpi/acpi.cc
@@ -503,12 +503,8 @@ class Element : public List<Element>::Element
 					memcpy(name, _data + offset, name_len);
 					name[name_len] = 0;
 
-					char name_dev[dev->_name_len + 1];
-					memcpy(name_dev, dev->_name, dev->_name_len);
-					name_dev[dev->_name_len] = 0;
-
 					if (verbose)
-						PDBG("Indirect %s %s", name, name_dev);
+						PDBG("Indirect %s", name);
 
 					for (uint32_t skip = 0; skip <= dev->_name_len / NAME_LEN; skip++) {
 						Element *e = dev->_compare(name, skip * NAME_LEN);
@@ -719,7 +715,7 @@ class Element : public List<Element>::Element
 				e->_bdf = (seg << 16) | (bbn << 8) | (adr >> 16) << 3 | (adr & 0xffff);
 
 				/* add routing */
-					Element *prt = e->_compare("_PRT");
+				Element *prt = e->_compare("_PRT");
 				if (prt) prt->dump();
 
 				if (prt) {