diff --git a/ChangeLog b/ChangeLog
index be78dd597..d995fbdb4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2009-01-27  Vesa Jääskeläinen  <chaac@nic.fi>
+
+	* commands/lsmmap.c: Add include to grub/machine/memory.h.
+
+	* fs/i386/pc/pxe.c (grub_pxefs_open): Fix sign problem.
+
+	* term/i386/pc/at_keyboard.c (GRUB_MOD_FINI(at_keyboard)): Use proper
+	unregister function.
+
 2009-01-27  Vesa Jääskeläinen  <chaac@nic.fi>
 
 	* disk/scsi.c (grub_scsi_read): Fix sign problem.
diff --git a/commands/lsmmap.c b/commands/lsmmap.c
index d2e53656c..c705591b9 100644
--- a/commands/lsmmap.c
+++ b/commands/lsmmap.c
@@ -16,6 +16,7 @@
  *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <grub/machine/memory.h>
 #include <grub/normal.h>
 #include <grub/dl.h>
 #include <grub/arg.h>
@@ -34,7 +35,7 @@ grub_cmd_lsmmap (struct grub_arg_list *state __attribute__ ((unused)),
       return 0;
     }
   grub_machine_mmap_iterate (hook);
-  
+
   return 0;
 }
 
diff --git a/fs/i386/pc/pxe.c b/fs/i386/pc/pxe.c
index f52d61188..e12ca18a5 100644
--- a/fs/i386/pc/pxe.c
+++ b/fs/i386/pc/pxe.c
@@ -133,7 +133,7 @@ grub_pxefs_open (struct grub_file *file, const char *name)
 
   c.c1.server_ip = grub_pxe_server_ip;
   c.c1.gateway_ip = grub_pxe_gateway_ip;
-  grub_strcpy (c.c1.filename, name);
+  grub_strcpy ((char *)&c.c1.filename[0], name);
   grub_pxe_call (GRUB_PXENV_TFTP_GET_FSIZE, &c.c1);
   if (c.c1.status)
     return grub_error (GRUB_ERR_FILE_NOT_FOUND, "file not found");
@@ -201,7 +201,7 @@ grub_pxefs_read (grub_file_t file, char *buf, grub_size_t len)
 
       o.server_ip = grub_pxe_server_ip;
       o.gateway_ip = grub_pxe_gateway_ip;
-      grub_strcpy (o.filename, data->filename);
+      grub_strcpy ((char *)&o.filename[0], data->filename);
       o.tftp_port = grub_cpu_to_be16 (GRUB_PXE_TFTP_PORT);
       o.packet_size = data->block_size;
       grub_pxe_call (GRUB_PXENV_TFTP_OPEN, &o);
diff --git a/term/i386/pc/at_keyboard.c b/term/i386/pc/at_keyboard.c
index c674ef312..ff5246d1b 100644
--- a/term/i386/pc/at_keyboard.c
+++ b/term/i386/pc/at_keyboard.c
@@ -231,5 +231,5 @@ GRUB_MOD_INIT(at_keyboard)
 
 GRUB_MOD_FINI(at_keyboard)
 {
-  grub_term_unregister_output (&grub_at_keyboard_term);
+  grub_term_unregister_input (&grub_at_keyboard_term);
 }