Index: boot/genarch/src/ofw_tree.c
===================================================================
--- boot/genarch/src/ofw_tree.c	(revision 850fd32a6ced0b28470d7b2100d44accba1dce89)
+++ boot/genarch/src/ofw_tree.c	(revision a35a3d819d4e2e4e35964eea617087b5c6431b02)
@@ -110,5 +110,7 @@
 		/* Find last slash */
 		size_t i;
-		for (i = len; (i > 0) && (path[i - 1] != '/'); i--);
+		i = len;
+		while (i > 0 && path[i - 1] != '/')
+			i--;
 
 		/* Do not include the slash */
Index: boot/generic/src/printf_core.c
===================================================================
--- boot/generic/src/printf_core.c	(revision 850fd32a6ced0b28470d7b2100d44accba1dce89)
+++ boot/generic/src/printf_core.c	(revision a35a3d819d4e2e4e35964eea617087b5c6431b02)
@@ -670,5 +670,5 @@
 				counter += retval;
 				j = nxt;
-				goto next_char;
+				continue;
 			case 'c':
 				retval = print_char(va_arg(ap, unsigned int), width, flags, ps);
@@ -677,9 +677,9 @@
 					counter = -counter;
 					goto out;
-				};
+				}
 
 				counter += retval;
 				j = nxt;
-				goto next_char;
+				continue;
 
 			/*
@@ -718,5 +718,5 @@
 			case '%':
 				j = i;
-				goto next_char;
+				continue;
 
 			/*
@@ -728,5 +728,5 @@
 				 * so we will print whole bad format sequence.
 				 */
-				goto next_char;
+				continue;
 			}
 
@@ -784,6 +784,4 @@
 			j = nxt;
 		}
-next_char:
-		;
 	}