Index: kernel/genarch/src/ofw/ebus.c
===================================================================
--- kernel/genarch/src/ofw/ebus.c	(revision 06b785f8cd841eaeec20587b753477850c12723b)
+++ kernel/genarch/src/ofw/ebus.c	(revision a7b10710077af5495dbbd8a18f1fb413be7dc5c2)
@@ -128,5 +128,5 @@
 		return false;
 		
-	if (strcmp(ofw_tree_node_name(controller), "pci") != 0) {
+	if (str_cmp(ofw_tree_node_name(controller), "pci") != 0) {
 		/*
 		 * This is not a PCI node.
Index: kernel/genarch/src/ofw/fhc.c
===================================================================
--- kernel/genarch/src/ofw/fhc.c	(revision 06b785f8cd841eaeec20587b753477850c12723b)
+++ kernel/genarch/src/ofw/fhc.c	(revision a7b10710077af5495dbbd8a18f1fb413be7dc5c2)
@@ -67,5 +67,5 @@
 				return true;
 			}
-			if (strcmp(ofw_tree_node_name(node->parent), "central") != 0)
+			if (str_cmp(ofw_tree_node_name(node->parent), "central") != 0)
 				panic("Unexpected parent node: %s.", ofw_tree_node_name(node->parent));
 			
Index: kernel/genarch/src/ofw/ofw_tree.c
===================================================================
--- kernel/genarch/src/ofw/ofw_tree.c	(revision 06b785f8cd841eaeec20587b753477850c12723b)
+++ kernel/genarch/src/ofw/ofw_tree.c	(revision a7b10710077af5495dbbd8a18f1fb413be7dc5c2)
@@ -67,5 +67,5 @@
 	
 	for (i = 0; i < node->properties; i++) {
-		if (strcmp(node->property[i].name, name) == 0)
+		if (str_cmp(node->property[i].name, name) == 0)
 			return &node->property[i];
 	}
@@ -110,5 +110,5 @@
 	 */
 	for (cur = node->child; cur; cur = cur->peer) {
-		if (strcmp(cur->da_name, name) == 0)
+		if (str_cmp(cur->da_name, name) == 0)
 			return cur;
 	}
@@ -122,5 +122,5 @@
 	 */
 	for (cur = node->child; cur; cur = cur->peer) {
-		if (strcmp(ofw_tree_node_name(cur), name) == 0)
+		if (str_cmp(ofw_tree_node_name(cur), name) == 0)
 			return cur;
 	}
@@ -147,5 +147,5 @@
 		if (!prop || !prop->value)
 			continue;
-		if (strcmp(prop->value, name) == 0)
+		if (str_cmp(prop->value, name) == 0)
 			return cur;
 	}
@@ -204,5 +204,5 @@
 		if (!prop || !prop->value)
 			continue;
-		if (strcmp(prop->value, name) == 0)
+		if (str_cmp(prop->value, name) == 0)
 			return cur;
 	}
@@ -230,5 +230,5 @@
 		if (!prop || !prop->value)
 			continue;
-		if (strcmp(prop->value, name) == 0)
+		if (str_cmp(prop->value, name) == 0)
 			return cur;
 	}
@@ -253,12 +253,13 @@
 		return NULL;
 	
-	for (i = 1; i < str_size(path) && node; i = j + 1) {
-		for (j = i; j < str_size(path) && path[j] != '/'; j++)
-			;
-		if (i == j)	/* skip extra slashes */
+	for (i = 1; (i < str_size(path)) && (node); i = j + 1) {
+		for (j = i; (j < str_size(path)) && (path[j] != '/'); j++);
+		
+		/* Skip extra slashes */
+		if (i == j)
 			continue;
-			
+		
 		memcpy(buf, &path[i], j - i);
-		buf[j - i] = '\0';
+		buf[j - i] = 0;
 		node = ofw_tree_find_child(node, buf);
 	}
Index: kernel/genarch/src/ofw/pci.c
===================================================================
--- kernel/genarch/src/ofw/pci.c	(revision 06b785f8cd841eaeec20587b753477850c12723b)
+++ kernel/genarch/src/ofw/pci.c	(revision a7b10710077af5495dbbd8a18f1fb413be7dc5c2)
@@ -59,5 +59,5 @@
 	prop = ofw_tree_getprop(node, "ranges");
 	if (!prop) {
-		if (strcmp(ofw_tree_node_name(node->parent), "pci") == 0)
+		if (str_cmp(ofw_tree_node_name(node->parent), "pci") == 0)
 			return ofw_pci_apply_ranges(node->parent, reg, pa);
 		return false;