diff --git a/libretro/graph.c b/libretro/graph.c
index 55e1fef..2cb7f63 100755
--- a/libretro/graph.c
+++ b/libretro/graph.c
@@ -297,7 +297,8 @@ unsigned char *mbuffer=(unsigned char *)surf;
 #endif
 
     	if(string==NULL)return;
-    	for(strlen = 0; strlen<maxstrlen && string[strlen]; strlen++) {}
+		strlen = sizeof(string);
+		if (strlen>maxstrlen) strlen = maxstrlen;
 
 	int surfw=strlen * 7 * xscale;
 	int surfh=8 * yscale;
diff --git a/libretro/vkbd_def.h b/libretro/vkbd_def.h
index 3c51075..6cff1c9 100644
--- a/libretro/vkbd_def.h
+++ b/libretro/vkbd_def.h
@@ -15,7 +15,7 @@ Mvk MVk[NPLGN*NLIGN*2]={
 	{ " 2 ", " \" ", " \xb2 ", RETROK_2},
 	{ " 3 ", " # ", " \xb3 ", RETROK_3},
 	{ " 4 ", " $ ", " \xb4 ", RETROK_4},
-	{ " 5 ", " % ", " \xb5 ", RETROK_5},
+	{ " 5 ", " %% ", " \xb5 ", RETROK_5},
 	{ " 6 ", " & ", " \xb6 ", RETROK_6},
 	{ " 7 ", " \' ", " \xb7 ", RETROK_7},
 	{ " 8 ", " @ ", " \xb8 ", RETROK_8},