diff --git a/include/grub/mips/qemu-r4k/memory.h b/include/grub/mips/qemu-r4k/memory.h
index 21f295b67..87e68674e 100644
--- a/include/grub/mips/qemu-r4k/memory.h
+++ b/include/grub/mips/qemu-r4k/memory.h
@@ -25,7 +25,8 @@
 #include <grub/types.h>
 #endif
 
-#define GRUB_MACHINE_MEMORY_STACK_HIGH       0x81000000
+#define GRUB_MACHINE_MEMORY_STACK_HIGH       0x80f00000
+#define GRUB_MACHINE_MEMORY_USABLE       0x81000000
 
 #define GRUB_MACHINE_MEMORY_AVAILABLE        1
 
diff --git a/include/grub/mips/types.h b/include/grub/mips/types.h
index f5f4602e4..fe09afa3e 100644
--- a/include/grub/mips/types.h
+++ b/include/grub/mips/types.h
@@ -31,7 +31,7 @@
 #elif defined (GRUB_CPU_MIPS)
 /* mips is big-endian.  */
 #define GRUB_TARGET_WORDS_BIGENDIAN
-#else
+#elif !defined (GRUB_SYMBOL_GENERATOR)
 #error Neither GRUB_CPU_MIPS nor GRUB_CPU_MIPSEL is defined
 #endif
 
diff --git a/kern/dl.c b/kern/dl.c
index 78ebc1e38..7cc5855bd 100644
--- a/kern/dl.c
+++ b/kern/dl.c
@@ -342,6 +342,7 @@ grub_dl_resolve_symbols (grub_dl_t mod, Elf_Ehdr *e)
       switch (type)
 	{
 	case STT_NOTYPE:
+	case STT_OBJECT:
 	  /* Resolve a global symbol.  */
 	  if (sym->st_name != 0 && sym->st_shndx == 0)
 	    {
@@ -351,15 +352,13 @@ grub_dl_resolve_symbols (grub_dl_t mod, Elf_Ehdr *e)
 				   "the symbol `%s' not found", name);
 	    }
 	  else
-	    sym->st_value = 0;
-	  break;
-
-	case STT_OBJECT:
-	  sym->st_value += (Elf_Addr) grub_dl_get_section_addr (mod,
-								sym->st_shndx);
-	  if (bind != STB_LOCAL)
-	    if (grub_dl_register_symbol (name, (void *) sym->st_value, mod))
-	      return grub_errno;
+	    {
+	      sym->st_value += (Elf_Addr) grub_dl_get_section_addr (mod,
+								    sym->st_shndx);
+	      if (bind != STB_LOCAL)
+		if (grub_dl_register_symbol (name, (void *) sym->st_value, mod))
+		  return grub_errno;
+	    }
 	  break;
 
 	case STT_FUNC:
diff --git a/kern/mips/qemu-r4k/init.c b/kern/mips/qemu-r4k/init.c
index 085c60bf8..8dfda57c2 100644
--- a/kern/mips/qemu-r4k/init.c
+++ b/kern/mips/qemu-r4k/init.c
@@ -22,9 +22,8 @@ grub_get_rtc (void)
 void
 grub_machine_init (void)
 {
-  void *tst;
-  grub_mm_init_region ((void *) GRUB_MACHINE_MEMORY_STACK_HIGH,
-		       RAMSIZE - (GRUB_MACHINE_MEMORY_STACK_HIGH & 0x7fffffff));
+  grub_mm_init_region ((void *) GRUB_MACHINE_MEMORY_USABLE,
+		       RAMSIZE - (GRUB_MACHINE_MEMORY_USABLE & 0x7fffffff));
   grub_install_get_time_ms (grub_rtc_get_time_ms);
 }
 
diff --git a/kern/term.c b/kern/term.c
index 789e4651b..0e3595df3 100644
--- a/kern/term.c
+++ b/kern/term.c
@@ -136,7 +136,6 @@ grub_getcharwidth (grub_uint32_t code)
 int
 grub_getkey (void)
 {
-  int c;
   if (!grub_cur_term_input)
     return 0;
   return (grub_cur_term_input->getkey) ();
diff --git a/term/serial.c b/term/serial.c
index 6c2d8ac09..4b6ac981d 100644
--- a/term/serial.c
+++ b/term/serial.c
@@ -29,7 +29,7 @@
 #include <grub/extcmd.h>
 
 #define TEXT_WIDTH	80
-#define TEXT_HEIGHT	25
+#define TEXT_HEIGHT	24
 
 static unsigned int xpos, ypos;
 static unsigned int keep_track = 1;
@@ -370,7 +370,7 @@ grub_serial_putchar (grub_uint32_t c)
 	  break;
 
 	case '\n':
-	  if (ypos < TEXT_HEIGHT)
+	  if (ypos < TEXT_HEIGHT - 1)
 	    ypos++;
 	  break;