diff --git a/GRRLIB/GRRLIB/GRRLIB_bmf.c b/GRRLIB/GRRLIB/GRRLIB_bmf.c
index 89f799f..23ce8a9 100644
--- a/GRRLIB/GRRLIB/GRRLIB_bmf.c
+++ b/GRRLIB/GRRLIB/GRRLIB_bmf.c
@@ -33,7 +33,7 @@ THE SOFTWARE.
  */
 GRRLIB_bytemapFont*  GRRLIB_LoadBMF (const u8 my_bmf[] ) {
     GRRLIB_bytemapFont *fontArray = (struct GRRLIB_bytemapFont *)malloc(sizeof(GRRLIB_bytemapFont));
-    int i, j = 1;
+    u32 i, j = 1;
     u8 lineheight, usedcolors, highestcolor, nbPalette;
     short int sizeover, sizeunder, sizeinner, numcolpal;
     u16 nbPixels;
@@ -83,7 +83,7 @@ GRRLIB_bytemapFont*  GRRLIB_LoadBMF (const u8 my_bmf[] ) {
  * @param bmf A GRRLIB_bytemapFont structure.
  */
 void  GRRLIB_FreeBMF (const GRRLIB_bytemapFont *bmf) {
-    unsigned int i;
+    u16 i;
 
     for (i=0; i<bmf->nbChar; i++) {
         free(bmf->charDef[i].data);
diff --git a/GRRLIB/GRRLIB/GRRLIB_print.c b/GRRLIB/GRRLIB/GRRLIB_print.c
index 0f95550..6fcb3a2 100644
--- a/GRRLIB/GRRLIB/GRRLIB_print.c
+++ b/GRRLIB/GRRLIB/GRRLIB_print.c
@@ -69,7 +69,9 @@ void  GRRLIB_Printf (const f32 xpos, const f32 ypos,
 void  GRRLIB_PrintBMF (const f32 xpos, const f32 ypos,
                        const GRRLIB_bytemapFont *bmf,
                        const char *text, ...) {
-    uint  i, j, x, y, n, size;
+    uint  i, n, size;
+    u16   j;
+    u8    x, y;
     char  tmp[1024];
     f32   xoff = xpos;