diff --git a/fstatqqq.f90 b/fstatqqq.f90
index 2e0cb6649..78aa7f066 100644
--- a/fstatqqq.f90
+++ b/fstatqqq.f90
@@ -1,10 +1,10 @@
 subroutine fstatqqq(lu,istat,ierr)
 
-#ifdef Win32
+#ifdef CVF
   use dfport
 #endif
 
-#ifdef Win32
+#ifdef CVF
   ierr=fstat(lu,istat)
 #else
   call fstat(lu,istat,ierr)
diff --git a/igray.c b/igray.c
index c59a4c9f0..395f79712 100644
--- a/igray.c
+++ b/igray.c
@@ -1,4 +1,4 @@
-#ifdef Win32
+#ifdef CVF
 extern int __stdcall IGRAY(int *n0, int *idir)
 #else
 int igray_(int *n0, int *idir)
diff --git a/jtaudio.c b/jtaudio.c
index 6e790c2d9..c9b8421b0 100644
--- a/jtaudio.c
+++ b/jtaudio.c
@@ -40,7 +40,7 @@ typedef struct _SYSTEMTIME
   short   Millisecond;
 } SYSTEMTIME;
 
-#ifdef Win32
+#ifdef CVF
 extern void __stdcall GetSystemTime(SYSTEMTIME *st);
 #else
 #include <sys/time.h>
diff --git a/map65.py b/map65.py
index 90a7581fa..156968722 100644
--- a/map65.py
+++ b/map65.py
@@ -8,8 +8,10 @@ from tkMessageBox import showwarning
 import g,os,time
 import Audio
 from math import log10
-#from Numeric import zeros
-from numpy import zeros
+try:
+    from numpy.oldnumeric import zeros
+except: 
+    from Numeric import zeros
 import dircache
 import Image,ImageTk  #, ImageDraw
 from palettes import colormapblue, colormapgray0, colormapHot, \
diff --git a/recvpkt.F90 b/recvpkt.F90
index 38ec7494a..4f1fe3c1f 100644
--- a/recvpkt.F90
+++ b/recvpkt.F90
@@ -4,7 +4,7 @@ subroutine recvpkt(iarg)
 ! Receive timf2 packets from Linrad, stuff data into id().
 ! This routine runs in a background thread and will never return.
 
-!#ifdef Win32
+!#ifdef CVF
 !  use dflib
 !#endif
 
diff --git a/resample.c b/resample.c
index 0a1b262b5..04f65e34a 100644
--- a/resample.c
+++ b/resample.c
@@ -1,5 +1,5 @@
 #include <stdio.h>
-//#ifdef Win32
+//#ifdef CVF
 #include "samplerate.h"
 //#else
 //#include <samplerate.h>
diff --git a/specjt.py b/specjt.py
index 47d82db30..1fb6fb02b 100644
--- a/specjt.py
+++ b/specjt.py
@@ -9,7 +9,11 @@ import g
 import string
 import cPickle
 #from Numeric import zeros, multiarray
-import numpy
+#import numpy
+try:
+    from numpy.oldnumeric import zeros, multiarray
+except:
+    from Numeric import zeros, multiarray
 import Image, ImageTk, ImageDraw
 from palettes import colormapblue, colormapgray0, colormapHot, \
      colormapAFMHot, colormapgray1, colormapLinrad, Colormap2Palette
@@ -69,15 +73,15 @@ ttot=0.0
 c=Canvas()
 NX=750
 NY=130
-#a=zeros(NX*NY,'s')
-a=numpy.zeros(NX*NY,numpy.int16)
+a=zeros(NX*NY,'s')
+#a=numpy.zeros(NX*NY,numpy.int16)
 im=Image.new('P',(NX,NY))
 line0=Image.new('P',(NX,1))  #Image fragment for top line of waterfall
 draw=ImageDraw.Draw(im)
 pim=ImageTk.PhotoImage(im)
 
-#a2=zeros(NX*NY,'s')
-a2=numpy.zeros(NX*NY,numpy.int16)
+a2=zeros(NX*NY,'s')
+#a2=numpy.zeros(NX*NY,numpy.int16)
 im2=Image.new('P',(NX,NY))
 line02=Image.new('P',(NX,1)) #Image fragment for top line of zoomed waterfall
 draw2=ImageDraw.Draw(im2)
diff --git a/sysqqq.f90 b/sysqqq.f90
index 590277b58..6ac3a8b68 100644
--- a/sysqqq.f90
+++ b/sysqqq.f90
@@ -1,6 +1,6 @@
 subroutine sysqqq(cmnd,iret)
 
-#ifdef Win32
+#ifdef CVF
   use dfport
 #else
   integer system
diff --git a/wrapkarn.c b/wrapkarn.c
index f093e020e..d22163f75 100644
--- a/wrapkarn.c
+++ b/wrapkarn.c
@@ -8,7 +8,7 @@
 void *rs;
 static int first=1;
 
-#ifdef Win32
+#ifdef CVF
 void __stdcall RS_ENCODE(int *dgen, int *sent)
 #else
 void rs_encode_(int *dgen, int *sent)
@@ -38,7 +38,7 @@ void rs_encode_(int *dgen, int *sent)
   for (i = 0; i < 12; i++) sent[i+51] = dat1[11-i];
 }
 
-#ifdef Win32
+#ifdef CVF
 void __stdcall RS_DECODE(int *recd0, int *era0, int *numera0, int *decoded, int *nerr)
 #else
 void rs_decode_(int *recd0, int *era0, int *numera0, int *decoded, int *nerr)
@@ -69,7 +69,7 @@ void rs_decode_(int *recd0, int *era0, int *numera0, int *decoded, int *nerr)
 }
 
 
-#ifndef Win32
+#ifndef CVF
 void rs_encode__(int *dgen, int *sent)
 {
 	rs_encode_(dgen, sent);