diff --git a/kern/term.c b/kern/term.c
index a65d67196..dba94ecf7 100644
--- a/kern/term.c
+++ b/kern/term.c
@@ -28,8 +28,6 @@ struct grub_term_input *grub_term_inputs_disabled;
 struct grub_term_output *grub_term_outputs;
 struct grub_term_input *grub_term_inputs;
 
-void (*grub_newline_hook) (void) = NULL;
-
 /* Put a Unicode character.  */
 static void
 grub_putcode_dumb (grub_uint32_t code,
diff --git a/normal/charset.c b/normal/charset.c
index 6c68884ae..0fcc2a440 100644
--- a/normal/charset.c
+++ b/normal/charset.c
@@ -1254,7 +1254,7 @@ grub_unicode_shape_code (grub_uint32_t in, grub_uint8_t attr)
   for (i = 0; grub_unicode_arabic_shapes[i].code; i++)
     if (grub_unicode_arabic_shapes[i].code == in)
       {
-	grub_uint32_t out;
+	grub_uint32_t out = 0;
 	switch (attr & (GRUB_UNICODE_GLYPH_ATTRIBUTE_RIGHT_JOINED
 			| GRUB_UNICODE_GLYPH_ATTRIBUTE_LEFT_JOINED))
 	  {
diff --git a/term/efi/console.c b/term/efi/console.c
index 35b265ddb..aa0c984c2 100644
--- a/term/efi/console.c
+++ b/term/efi/console.c
@@ -350,7 +350,7 @@ static struct grub_term_output grub_console_term_output =
     .setcolor = grub_console_setcolor,
     .getcolor = grub_console_getcolor,
     .setcursor = grub_console_setcursor,
-    .flags = GRUB_TERM_CODE_TYPE_UCS4_VISUAL
+    .flags = GRUB_TERM_CODE_TYPE_VISUAL_GLYPHS
   };
 
 void