diff --git a/bin/shell/exec.c b/bin/shell/exec.c
index 4470e2d..fca303b 100644
--- a/bin/shell/exec.c
+++ b/bin/shell/exec.c
@@ -71,7 +71,7 @@
 
   if (!cPid) {
     sprintf(file, "%s%s", cwd, data->argv[1]);
-    execve(file, argv_init, envp_init);
+    execve(file, argv_init, envp_init_old);
     printf("%s: Command Not Found.\n", data->argv[1]);
     exit(-1);
   }
diff --git a/libexec/rtld-elf/Makefile b/libexec/rtld-elf/Makefile
index 2035970..bce6296 100644
--- a/libexec/rtld-elf/Makefile
+++ b/libexec/rtld-elf/Makefile
@@ -87,6 +87,6 @@
 SUBDIR+=	tests
 .endif
 
-.include <bsd.prog.mk>
-${PROG_FULL}:	${VERSION_MAP}
-.include <bsd.symver.mk>
+#.include <bsd.prog.mk>
+#${PROG_FULL}:	${VERSION_MAP}
+#.include <bsd.symver.mk>
diff --git a/libexec/rtld-elf/map_object.c b/libexec/rtld-elf/map_object.c
index 9b13a13..83a3856 100644
--- a/libexec/rtld-elf/map_object.c
+++ b/libexec/rtld-elf/map_object.c
@@ -331,7 +331,7 @@
 
 	/* Make sure file has enough data for the ELF header */
 	if (sbp != NULL && sbp->st_size < sizeof(Elf_Ehdr)) {
-		_rtld_error("%s: invalid file format", path);
+		_rtld_error("%s: invalid file format.", path);
 		return (NULL);
 	}
 
@@ -344,7 +344,7 @@
 
 	/* Make sure the file is valid */
 	if (!IS_ELF(*hdr)) {
-		_rtld_error("%s: invalid file format", path);
+		_rtld_error("%s: invalid file format!", path);
 		goto error;
 	}
 	if (hdr->e_ident[EI_CLASS] != ELF_TARG_CLASS ||