diff --git a/src/config/param.sun4x_58_usr.h b/src/config/param.sun4x_58_usr.h
index 98d41088f4..87fec13ec7 100644
--- a/src/config/param.sun4x_58_usr.h
+++ b/src/config/param.sun4x_58_usr.h
@@ -15,6 +15,8 @@
 #define AFS_USR_SUN7_ENV	1
 #define AFS_USR_SUN8_ENV	1
 
+#define AFS_64BIT_ENV          1
+
 #include <afs/afs_sysnames.h>
 
 /*#define AFS_GLOBAL_SUNLOCK	1	/* For global locking */
diff --git a/src/vol/gi.c b/src/vol/gi.c
index 23d0d7fe7a..8b6736831f 100644
--- a/src/vol/gi.c
+++ b/src/vol/gi.c
@@ -26,6 +26,12 @@ char **argv;
 	int error=0;
 	struct stat status;
 	int dev, fd, inode;
+
+#if defined(AFS_NT40_ENV) || defined(AFS_NAMEI_ENV)
+	fprintf(stderr, "gi not supported on NT or NAMEI systems.\n");
+	exit(1);
+#else
+
 	argc--; argv++;
 	while (argc && **argv == '-') {
 		if (strcmp(*argv, "-stat") == 0)
@@ -65,6 +71,7 @@ char **argv;
 			write(1, buf, n);
 	}
 	exit(0);
+#endif /* AFS_NT40_ENV || AFS_NAMEI_ENV */
 }
 
 Perror(err, a1, a2, a3)