Index: kernel/genarch/src/multiboot/multiboot.c
===================================================================
--- kernel/genarch/src/multiboot/multiboot.c	(revision 4a816feed48c46496f885c8d7abbc9f95e2e71a4)
+++ kernel/genarch/src/multiboot/multiboot.c	(revision 82bb9c121efbe640882ffd5dbdc9101eb995d0fa)
@@ -55,5 +55,5 @@
 	end = strchr(cmd_line, ' ');
 	if (end == NULL)
-		end = cmd_line + strlen(cmd_line);
+		end = cmd_line + str_size(cmd_line);
 	
 	/*
Index: kernel/genarch/src/ofw/ofw_tree.c
===================================================================
--- kernel/genarch/src/ofw/ofw_tree.c	(revision 4a816feed48c46496f885c8d7abbc9f95e2e71a4)
+++ kernel/genarch/src/ofw/ofw_tree.c	(revision 82bb9c121efbe640882ffd5dbdc9101eb995d0fa)
@@ -253,6 +253,6 @@
 		return NULL;
 	
-	for (i = 1; i < strlen(path) && node; i = j + 1) {
-		for (j = i; j < strlen(path) && path[j] != '/'; j++)
+	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 */