diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c
index 65d298e74..2410b4550 100644
--- a/grub-core/fs/btrfs.c
+++ b/grub-core/fs/btrfs.c
@@ -334,6 +334,7 @@ lower_bound (struct grub_btrfs_data *data, grub_disk_t disk,
 	  unsigned i;
 	  struct grub_btrfs_internal_node node, node_last;
 	  int have_last = 0;
+	  grub_memset (node_last, 0, sizeof (node_last));
 	  for (i = 0; i < grub_le_to_cpu32 (head.nitems); i++)
 	    {
 	      err = grub_btrfs_read_logical (data, disk, addr
@@ -752,7 +753,7 @@ grub_btrfs_dir (grub_device_t device,
   grub_size_t allocated = 0;
   struct grub_btrfs_dir_item *direl = NULL;
   struct grub_btrfs_leaf_descriptor desc;
-  int r;
+  int r = 0;
   grub_uint64_t tree;
   grub_uint8_t type;