diff --git a/build-support/target b/build-support/target
index 8e07c1afdc..1903a6da64 100755
--- a/build-support/target
+++ b/build-support/target
@@ -15,7 +15,7 @@ then
 elif [ \( `uname -s` = NetBSD \) -a \( `uname -p` = i386 \) ]
 then
   echo netbsd-x86-32
-elif [ \( `uname -s` = NetBSD \) -a \( `uname -p` = amd64 \) ]
+elif [ \( `uname -s` = NetBSD \) -a \( `uname -p` = x86_64 \) ]
 then
   echo netbsd-x86-64
 elif [ \( `uname -s` = Darwin \) -a \( `uname -p` = powerpc \) ]
diff --git a/extra/io/windows/files/unique/unique.factor b/extra/io/windows/files/unique/unique.factor
index 112dea48a7..7e7610eb72 100644
--- a/extra/io/windows/files/unique/unique.factor
+++ b/extra/io/windows/files/unique/unique.factor
@@ -1,5 +1,5 @@
 USING: kernel system io.files.unique.backend
-windows.kernel32 io.windows io.nonblocking ;
+windows.kernel32 io.windows io.nonblocking windows ;
 IN: io.windows.files.unique
 
 M: windows-io (make-unique-file) ( path -- )
diff --git a/misc/factor.sh b/misc/factor.sh
index 276956b0b7..9d4f26fa46 100755
--- a/misc/factor.sh
+++ b/misc/factor.sh
@@ -88,6 +88,9 @@ set_md5sum() {
 set_gcc() {
     case $OS in
         openbsd) ensure_program_installed egcc; CC=egcc;;
+	netbsd) if [[ $WORD -eq 64 ]] ; then
+			CC=/usr/pkg/gcc34/bin/gcc
+		fi ;;
         *) CC=gcc;;
     esac
 }