diff --git a/mkbootimg/gpt.c b/mkbootimg/gpt.c
index 1619c7e..356f8fd 100644
--- a/mkbootimg/gpt.c
+++ b/mkbootimg/gpt.c
@@ -51,7 +51,7 @@ void gpt_maketable()
     unsigned long int size, ps, total, l;
     unsigned char *iso, *p;
     uint16_t *u;
-    char isodate[17], key[64], *tmp, *name;
+    char isodate[64], key[64], *tmp, *name;
     guid_t typeguid;
     FILE *f;
 
diff --git a/mkbootimg/main.c b/mkbootimg/main.c
index 83a55d6..fc00f1b 100644
--- a/mkbootimg/main.c
+++ b/mkbootimg/main.c
@@ -31,15 +31,16 @@
 #include "fs.h"
 
 #ifdef __WIN32__
-#include <windows.h>
-#define ISHH(x) ((((x)>>30)&0xFFFFFFFF)==0xFFFFFFFF)
+# include <windows.h>
+# define ISHH(x) ((((x)>>30)&0xFFFFFFFF)==0xFFFFFFFF)
+# define LL "I64"
 #else
-#define ISHH(x) (((x)>>30)==0x3FFFFFFFF)
-#endif
-#if defined(MACOSX) || __WORDSIZE == 32
-#define LL "ll"
-#else
-#define LL "l"
+# define ISHH(x) (((x)>>30)==0x3FFFFFFFF)
+# if defined(MACOSX) || __WORDSIZE == 32
+#  define LL "ll"
+# else
+#  define LL "l"
+# endif
 #endif
 
 extern const char deflate_copyright[];
@@ -349,7 +350,7 @@ void parsekernel(int idx, unsigned char *data, int v)
             { if(v) { printf("invalid\r\n"); } fprintf(stderr,"mkbootimg: initstack %s\r\n",lang[ERR_BADSIZE]); exit(1); }
         if(v) printf("OK\r\n");
     }
-    if(v) printf("Load segment: %016" LL "x size %" LL "dK offs %" LL "x ", core_addr, (core_size + bss + 1024)/1024, core_ptr);
+    if(v) printf("Load segment: %016" LL "x size %" LL "uK offs %" LL "x ", core_addr, (core_size + bss + 1024)/1024, core_ptr);
     if(!ISHH(core_addr)) { if(v) { printf("invalid\r\n"); } fprintf(stderr,"mkbootimg: segment %s\r\n",lang[ERR_BADADDR]); exit(1); }
     if(core_addr & 4095) { if(v) { printf("invalid\r\n"); } fprintf(stderr,"mkbootimg: segment %s\r\n",lang[ERR_PAGEALIGN]); exit(1); }
     if(core_size + bss > 16 * 1024 * 1024) { if(v) { printf("invalid\r\n"); } fprintf(stderr,"mkbootimg: segment %s\r\n",lang[ERR_BIGSEG]); exit(1); }
diff --git a/mkbootimg/util.c b/mkbootimg/util.c
index 3b62e2e..a9c0448 100644
--- a/mkbootimg/util.c
+++ b/mkbootimg/util.c
@@ -71,7 +71,7 @@ unsigned char* readfileall(char *file)
         data=(unsigned char*)malloc(read_size+1);
         if(!data) { fprintf(stderr,"mkbootimg: %s\r\n",lang[ERR_MEM]); exit(1); }
         memset(data,0,read_size+1);
-        fread(data,read_size,1,f);
+        fread(data,1,read_size,f);
         data[read_size] = 0;
         fclose(f);
     }