diff --git a/borrow/rpfits/code/rpfitsin.f b/borrow/rpfits/code/rpfitsin.f
index 3e5f86da..0be74263 100644
--- a/borrow/rpfits/code/rpfitsin.f
+++ b/borrow/rpfits/code/rpfitsin.f
@@ -831,9 +831,9 @@ C-----------------------------------------------------------------------
       include 'rpfits.inc'
 
       logical   ILLPARM
-      integer   baseline, bin, bufptr, flag, grpptr, i_grphdr(640),
+      integer   baseline, bin, bufptr, flag, grpptr, i_grphdr(11),
      :          iant, if_no, iif, iq, jstat, lun, pcount, sourceno
-      real      grphdr(640), buffer(640), rbase, u, v, w, ut
+      real      grphdr(11), buffer(640), rbase, u, v, w, ut
 
 C     First 5 parameters are always there - you hope!
       call VAXR4 (grphdr(grpptr),   u)
diff --git a/src/prog/analysis/velmodel.for b/src/prog/analysis/velmodel.for
index 06c3f352..0f5ec1ec 100644
--- a/src/prog/analysis/velmodel.for
+++ b/src/prog/analysis/velmodel.for
@@ -280,7 +280,7 @@ c compute rms velocity along line of sight.
 c
 	implicit none
 	integer nstep
-	real xt,yt,vrot(1),vrad(2),vr(nstep),rstep,vel,radius(1)
+	real xt,yt,vrot(2),vrad(2),vr(nstep),rstep,vel,radius(1)
 	real z0,zexp,sini
 	logical dosamp
 c----------------------------------------------------------------------
diff --git a/src/prog/sma/smablsrc.for b/src/prog/sma/smablsrc.for
index cbd045ec..fd8e8764 100644
--- a/src/prog/sma/smablsrc.for
+++ b/src/prog/sma/smablsrc.for
@@ -728,7 +728,7 @@ c************************************************************************
         subroutine avgchn(numpol,bchan,echan,data,flags,nchan,
      *  bpnspect,bpnschan,maxchan,chnwt,chz,chzwt,
      *  weight,dochunk)
-        PARAMETER(maxwin=33, maxschan=1024, maxpol=2)
+        PARAMETER(maxschan=1024, maxpol=2)
         integer nchan,bpnspect,maxchan,bpnschan(maxwin)
         integer i,j,numpol,bchan,echan, ipol
         integer bschan, eschan
@@ -817,7 +817,7 @@ c************************************************************************
         subroutine divchz(numpol,data,ndata,nchan,
      *  bpnspect,bpnschan,maxchan,chnwt,chz,chzwt,weight,
      *  edge,dochunk)
-        PARAMETER(maxwin=49, maxschan=1024, maxpol=2)
+        PARAMETER(maxschan=1024, maxpol=2)
         PARAMETER(pi=3.14159265358979323846)
         integer nchan,bpnspect,maxchan,bpnschan(maxwin)
         integer i,j,numpol, ipol
diff --git a/src/prog/sma/smamfcal.for b/src/prog/sma/smamfcal.for
index 919e42d3..e58c66fb 100755
--- a/src/prog/sma/smamfcal.for
+++ b/src/prog/sma/smamfcal.for
@@ -1988,7 +1988,7 @@ c
 c************************************************************************
         subroutine avgchn(numpol,bchan,echan,data,flags,nchan,
      *  bpnspect,bpnschan,maxchan,chnwt,chz,chzwt,weight,sb,telescop)
-        PARAMETER(maxwin=49, maxpol=2)
+        PARAMETER(maxpol=2)
         integer nchan,bpnspect,maxchan,bpnschan(maxwin),sb(maxwin)
         integer i,j,numpol,bchan,echan, ipol
         integer bschan, eschan 
@@ -2116,7 +2116,7 @@ c************************************************************************
         subroutine divchz(numpol,data,ndata,nchan,
      *  bpnspect,bpnschan,maxchan,chnwt,chz,chzwt,weight,
      *  edge)
-        PARAMETER(maxwin=49, maxpol=2)
+        PARAMETER(maxpol=2)
         PARAMETER(pi=3.14159265358979323846)
         integer nchan,bpnspect,maxchan,bpnschan(maxwin)
         integer i,j,numpol,ipol
diff --git a/src/prog/vis/uvtriple.for b/src/prog/vis/uvtriple.for
index 0c105ee5..1ae1c1f9 100644
--- a/src/prog/vis/uvtriple.for
+++ b/src/prog/vis/uvtriple.for
@@ -2041,7 +2041,7 @@ c
               win(3) = ylo
               win(4) = yhi
             else
-              call windec (2, str, il, win(3), ok)
+              call windec (2, str, il, win, ok)
             end if
          end if
         else
diff --git a/src/prog/analysis/Makefile.in b/src/prog/analysis/Makefile.in
index 09a6d270..6b9cd1fc 100644
--- a/src/prog/analysis/Makefile.in
+++ b/src/prog/analysis/Makefile.in
@@ -113,7 +113,7 @@ CONFIG_HEADER = $(top_builddir)/config.h \
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 am__EXEEXT_1 = avmaths$(EXEEXT) boxspec$(EXEEXT) boxtest$(EXEEXT) \
-	clfind$(EXEEXT) clplot$(EXEEXT) clstats$(EXEEXT) \
+	clfind$(EXEEXT) clstats$(EXEEXT) \
 	colden$(EXEEXT) contsub$(EXEEXT) convol$(EXEEXT) \
 	demos$(EXEEXT) deproject$(EXEEXT) ellint$(EXEEXT) \
 	ellplt$(EXEEXT) fft$(EXEEXT) gaufit$(EXEEXT) gaufit2$(EXEEXT) \
@@ -792,7 +792,7 @@ prog_libs = \
   $(top_builddir)/borrow/pgplot/libpgplot.la
 
 LDADD = $(prog_libs)
-ftasks = avmaths boxspec boxtest clfind clplot \
+ftasks = avmaths boxspec boxtest clfind \
   clstats colden contsub convol demos \
   deproject ellint ellplt fft gaufit gaufit2 \
   hanning hatfft hermes histo imbin \