diff --git a/Headers/Additions/GNUstepBase/GSIMap.h b/Headers/Additions/GNUstepBase/GSIMap.h
index f2daa2a39..6a73f46f0 100644
--- a/Headers/Additions/GNUstepBase/GSIMap.h
+++ b/Headers/Additions/GNUstepBase/GSIMap.h
@@ -427,9 +427,9 @@ GSIMapMoreNodes(GSIMapTable map, unsigned required)
       size_t		chunkCount;
       size_t		chunkSize;
 
-      memcpy(newArray, map->nodeChunks, (map->chunkCount)*sizeof(GSIMapNode));
       if (map->nodeChunks != 0)
 	{
+	  memcpy(newArray, map->nodeChunks, (map->chunkCount)*sizeof(GSIMapNode));
 	  NSZoneFree(map->zone, map->nodeChunks);
 	}
       map->nodeChunks = newArray;
diff --git a/Tools/GNUmakefile b/Tools/GNUmakefile
index af03b88b8..dc892d6ab 100644
--- a/Tools/GNUmakefile
+++ b/Tools/GNUmakefile
@@ -90,7 +90,7 @@ autogsdoc_AGSDOC_FILES = autogsdoc.m \
 autogsdoc_DOC_INSTALL_DIR = Developer/Tools
 
 # Use local version of autogsdoc in case it is not installed
-AUTOGSDOC=./obj/autogsdoc
+AUTOGSDOC=./$(GNUSTEP_OBJ_PREFIX)/autogsdoc
 
 include Makefile.preamble
 
diff --git a/config/config.reuseaddr.c b/config/config.reuseaddr.c
index 4f33c2ac5..ef4e25c5b 100644
--- a/config/config.reuseaddr.c
+++ b/config/config.reuseaddr.c
@@ -5,7 +5,7 @@
   are permitted in any medium without royalty provided the copyright
   notice and this notice are preserved.
 */
-#if defined(__MINGW__) || defined(__MINGW32__)
+#if defined(__MINGW32__)
 #include <windows.h>
 #include <winsock2.h>
 #else
@@ -16,7 +16,7 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <signal.h>
-#endif /* __MINGW__ */
+#endif /* __MINGW32__ */
 
 #include <sys/file.h>
 #include <sys/stat.h>