diff -ur grub2-1.95+20070520.old/util/biosdisk.c grub2-1.95+20070520/util/biosdisk.c
--- grub2-1.95+20070520.old/util/biosdisk.c	2007-06-04 20:35:48.000000000 +0200
+++ grub2-1.95+20070520/util/biosdisk.c	2007-06-04 20:35:53.000000000 +0200
@@ -732,7 +732,7 @@
     int find_partition (grub_disk_t disk __attribute__ ((unused)),
 			const grub_partition_t partition)
       {
- 	struct grub_pc_partition *pcdata = 0;
+ 	struct grub_pc_partition *pcdata = NULL;
 
 	if (strcmp (partition->partmap->name, "pc_partition_map") == 0)
 	  pcdata = partition->data;
@@ -816,8 +816,7 @@
     if (dos_part < 0)
       {
 	grub_disk_close (disk);
-	grub_error (GRUB_ERR_BAD_DEVICE,
-		    "cannot find the partition of `%s'", os_dev);
+	grub_util_error ("cannot find the partition of `%s'", os_dev);
 	return 0;
       }
     
diff -ur grub2-1.95+20070520.old/util/grub-probe.c grub2-1.95+20070520/util/grub-probe.c
--- grub2-1.95+20070520.old/util/grub-probe.c	2007-06-04 20:35:48.000000000 +0200
+++ grub2-1.95+20070520/util/grub-probe.c	2007-06-04 20:35:53.000000000 +0200
@@ -81,7 +81,7 @@
 probe (const char *path)
 {
   char *device_name;
-  char *drive_name = 0;
+  char *drive_name = NULL;
   grub_device_t dev;
   grub_fs_t fs;