diff --git a/ChangeLog b/ChangeLog
index 9f37ae986..be78dd597 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2009-01-27  Vesa Jääskeläinen  <chaac@nic.fi>
+
+	* disk/scsi.c (grub_scsi_read): Fix sign problem.
+
+	* term/i386/pc/vga_text.c (grub_vga_text_init_fini). Fix declaration.
+
+	* util/grub-mkfont.c (usage): Fix typo.
+
+	* util/elf/grub-mkimage.c (load_modules): Fix warning.
+
 2009-01-26  Daniel Mierswa  <impulze@impulze.org>
 
 	* fs/fat.c (grub_fat_uuid): Fix shift of the first two bytes.
diff --git a/disk/scsi.c b/disk/scsi.c
index d1653097c..5dce28873 100644
--- a/disk/scsi.c
+++ b/disk/scsi.c
@@ -41,7 +41,7 @@ void
 grub_scsi_dev_unregister (grub_scsi_dev_t dev)
 {
   grub_scsi_dev_t *p, q;
-  
+
   for (p = &grub_scsi_dev_list, q = *p; q; p = &(q->next), q = q->next)
     if (q == dev)
       {
@@ -52,7 +52,7 @@ grub_scsi_dev_unregister (grub_scsi_dev_t dev)
 
 
 /* Determine the the device is removable and the type of the device
-   SCSI.  */ 
+   SCSI.  */
 static grub_err_t
 grub_scsi_inquiry (grub_scsi_t scsi)
 {
@@ -231,7 +231,7 @@ grub_scsi_open (const char *name, grub_disk_t disk)
   grub_err_t err;
   int len;
   int lun;
-  
+
   scsi = grub_malloc (sizeof (*scsi));
   if (! scsi)
     return grub_errno;
@@ -269,7 +269,7 @@ grub_scsi_open (const char *name, grub_disk_t disk)
 
 	  grub_dprintf ("scsi", "inquiry: devtype=0x%02x removable=%d\n",
 			scsi->devtype, scsi->removable);
-	  
+
 	  /* Try to be conservative about the device types
 	     supported.  */
 	  if (scsi->devtype != grub_scsi_devtype_direct
@@ -332,7 +332,7 @@ grub_scsi_read (grub_disk_t disk, grub_disk_addr_t sector,
 	return grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET,
 			   "Unsupported SCSI block size");
 
-      grub_int32_t sector_mod = 0;
+      grub_uint32_t sector_mod = 0;
       sector = grub_divmod64 (sector, spb, &sector_mod);
 
       if (! (sector_mod == 0 && size % spb == 0))
diff --git a/term/i386/pc/vga_text.c b/term/i386/pc/vga_text.c
index 0649262d5..e067ed615 100644
--- a/term/i386/pc/vga_text.c
+++ b/term/i386/pc/vga_text.c
@@ -143,7 +143,7 @@ grub_vga_text_setcursor (int on)
 }
 
 static grub_err_t
-grub_vga_text_init_fini ()
+grub_vga_text_init_fini (void)
 {
   grub_vga_text_cls ();
   return 0;
diff --git a/util/elf/grub-mkimage.c b/util/elf/grub-mkimage.c
index 715dddad8..f841035c2 100644
--- a/util/elf/grub-mkimage.c
+++ b/util/elf/grub-mkimage.c
@@ -103,7 +103,9 @@ load_modules (grub_addr_t modbase, Elf32_Phdr *phdr, const char *dir,
   struct grub_util_path_list *path_list;
   struct grub_util_path_list *p;
   struct grub_module_info *modinfo;
-  size_t offset, total_module_size, memdisk_size;
+  size_t offset;
+  size_t total_module_size;
+  size_t memdisk_size = 0;
 
   path_list = grub_util_resolve_dependencies (dir, "moddep.lst", mods);
 
@@ -197,7 +199,7 @@ add_segments (char *dir, char *prefix, FILE *out, int chrp, char *mods[], char *
     grub_util_error ("cannot open %s", kernel_path);
 
   grub_util_read_at (&ehdr, sizeof (ehdr), 0, in);
-  
+
   offset = ALIGN_UP (sizeof (ehdr), GRUB_TARGET_SIZEOF_LONG);
   ehdr.e_phoff = grub_host_to_target32 (offset);
 
@@ -240,7 +242,7 @@ add_segments (char *dir, char *prefix, FILE *out, int chrp, char *mods[], char *
 
       /* Read segment data and write it to new file.  */
       segment_img = xmalloc (grub_target_to_host32 (phdr->p_filesz));
-  
+
       grub_util_read_at (segment_img, grub_target_to_host32 (phdr->p_filesz),
 			 grub_target_to_host32 (phdr->p_offset), in);
 
@@ -379,11 +381,11 @@ main (int argc, char *argv[])
 	    if (memdisk)
 	      free (memdisk);
 	    memdisk = xstrdup (optarg);
-	    
+
 	    if (prefix)
 	      free (prefix);
 	    prefix = xstrdup ("(memdisk)/boot/grub");
-	    
+
 	    break;
 	  case 'h':
 	    usage (0);
diff --git a/util/grub-mkfont.c b/util/grub-mkfont.c
index 330e47d74..cfd6f9df3 100644
--- a/util/grub-mkfont.c
+++ b/util/grub-mkfont.c
@@ -102,7 +102,7 @@ Usage: grub-mkfont [OPTIONS] FONT_FILES\n\
   -s, --size=N              set font size\n\
   -d, --desc=N              set font descent\n\
   -b, --bold                convert to bold font\n\
-  -a, --force-autohine      force autohint\n\
+  -a, --force-autohint      force autohint\n\
   --no-hinting              disable hinting\n\
   --no-bitmap               ignore bitmap strikes when loading\n\
   -h, --help                display this message and exit\n\