diff --git a/commands/i2c.c b/commands/i2c.c
index 573032a..b74c535 100644
--- a/commands/i2c.c
+++ b/commands/i2c.c
@@ -129,7 +129,7 @@
 
 	buf = xmalloc(count);
 	for (i = 0; i < count; i++)
-		*(buf + i) = (char) simple_strtol(argv[optind+i], NULL, 16);
+		*(buf + i) = (char) simple_strtol(argv[optind+i], NULL, 0);
 
 	ret = i2c_write_reg(&client, reg | wide, buf, count);
 	if (ret != count) {
diff --git a/commands/spi.c b/commands/spi.c
index 6603b34..7bf193b 100644
--- a/commands/spi.c
+++ b/commands/spi.c
@@ -84,7 +84,7 @@
 	rx_buf = xmalloc(read);
 
 	for (i = 0; i < count; i++)
-		tx_buf[i] = (u8) simple_strtol(argv[optind + i], NULL, 16);
+		tx_buf[i] = (u8) simple_strtol(argv[optind + i], NULL, 0);
 
 	ret = spi_write_then_read(&spi, tx_buf, count, rx_buf, read);
 	if (ret)
diff --git a/lib/gui/2d-primitives.c b/lib/gui/2d-primitives.c
index 89acc09..82e59d9 100644
--- a/lib/gui/2d-primitives.c
+++ b/lib/gui/2d-primitives.c
@@ -72,7 +72,7 @@
 }
 
 /**
- * gl_draw_line - draw a 2D dashed line between (x1, y1) and (x2,y2)
+ * gu_draw_line - draw a 2D dashed line between (x1, y1) and (x2,y2)
  *
  * @sc: screen to draw on
  * @x1, @y1: first point defining the line
@@ -80,7 +80,7 @@
  * @r, @g, @b, @a: line's color
  * @dash: dash length (0 denotes solid line)
  *
- * gl_draw_line() implements integer version of Bresenham's algoritm
+ * gu_draw_line() implements integer version of Bresenham's algoritm
  * as can be found here:
  *
  * http://www.idav.ucdavis.edu/education/GraphicsNotes/Bresenhams-Algorithm.pdf
@@ -158,7 +158,7 @@
 }
 
 /**
- * gl_draw_circle - draw a 2D circle with center at (x0, y0)
+ * gu_draw_circle - draw a 2D circle with center at (x0, y0)
  *
  * @sc: screen to draw on
  * @x0, @y0: coordinates of circle's center