diff --git a/ChangeLog b/ChangeLog
index 330656cc3..436c0980b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2010-09-12  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/kern/emu/main.c (main): Call hostfs_init only after init_all.
+
+2010-09-12  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/commands/menuentry.c (append_menu_entry): Don't rely on
+	args ending with NULL.
+
+2010-09-12  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/lib/xzembed/xz_dec_stream.c (xz_dec_reset): Preserve context
+	pointer.
+
 2010-09-11  Szymon Janc <szymon@janc.net.pl>
 
 	* grub-core/commands/lsacpi.c (grub_cmd_lsacpi): Fix prototype.
diff --git a/grub-core/commands/menuentry.c b/grub-core/commands/menuentry.c
index cd5f38f69..538218ead 100644
--- a/grub-core/commands/menuentry.c
+++ b/grub-core/commands/menuentry.c
@@ -128,7 +128,7 @@ grub_normal_add_menu_entry (int argc, const char **args, char **classes,
   if (! menu_args)
     goto fail;
 
-  for (i = 0; args[i]; i++)
+  for (i = 0; i < argc; i++)
     {
       menu_args[i] = grub_strdup (args[i]);
       if (! menu_args[i])
diff --git a/grub-core/kern/emu/main.c b/grub-core/kern/emu/main.c
index 23b8516f1..c575beb4b 100644
--- a/grub-core/kern/emu/main.c
+++ b/grub-core/kern/emu/main.c
@@ -190,13 +190,14 @@ main (int argc, char *argv[])
   grub_emu_init ();
   grub_console_init ();
   grub_host_init ();
-  grub_hostfs_init ();
 
   /* XXX: This is a bit unportable.  */
   grub_util_biosdisk_init (dev_map);
 
   grub_init_all ();
 
+  grub_hostfs_init ();
+
   grub_emu_post_init ();
 
   /* Make sure that there is a root device.  */
diff --git a/grub-core/lib/xzembed/xz_dec_stream.c b/grub-core/lib/xzembed/xz_dec_stream.c
index 642492483..ff26f5119 100644
--- a/grub-core/lib/xzembed/xz_dec_stream.c
+++ b/grub-core/lib/xzembed/xz_dec_stream.c
@@ -830,8 +830,15 @@ void xz_dec_reset(struct xz_dec *s)
 	s->allow_buf_error = false;
 	s->pos = 0;
 
-	memzero(&s->block, sizeof(s->block));
-	memzero(&s->index, sizeof(s->index));
+	{
+		uint8_t *t;
+		t = s->block.hash.crc32_context;
+		memzero(&s->block, sizeof(s->block));
+		s->block.hash.crc32_context = t;
+		t = s->index.hash.crc32_context;
+		memzero(&s->index, sizeof(s->index));
+		s->index.hash.crc32_context = t;
+	}
 	s->temp.pos = 0;
 	s->temp.size = STREAM_HEADER_SIZE;