diff --git a/baseline.f90 b/baseline.f90
index 4f898f0..9cc8ce7 100644
--- a/baseline.f90
+++ b/baseline.f90
@@ -4,14 +4,15 @@ subroutine baseline(s,nfa,nfb,sbase)
 ! Input:  s(npts)         Linear scale in power
 ! Output: sbase(npts)    Baseline
 
+  include 'ft8_params.f90'
   implicit real*8 (a-h,o-z)
-  real*4 s(1920)
-  real*4 sbase(1920)
+  real*4 s(NSPS)
+  real*4 sbase(NSPS)
   real*4 base
   real*8 x(1000),y(1000),a(5)
   data nseg/10/,npct/10/
 
-  df=12000.0/3840.0                    !3.125 Hz
+  df=12000.0/NFFT1                    !3.125 Hz
   ia=max(1,nint(nfa/df))
   ib=nint(nfb/df)
   do i=ia,ib
diff --git a/ft8b.f90 b/ft8b.f90
index 045a996..0efc3e8 100644
--- a/ft8b.f90
+++ b/ft8b.f90
@@ -17,7 +17,7 @@ subroutine ft8b(dd0,newdat,nQSOProgress,nfqso,nftx,ndepth,lapon,lapcqonly,   &
   real ps(0:7),psl(0:7)
   real bmeta(3*ND),bmetb(3*ND),bmetap(3*ND)
   real llr(3*ND),llra(3*ND),llr0(3*ND),llr1(3*ND),llrap(3*ND)           !Soft symbols
-  real dd0(15*12000)
+  real dd0(NMAX)
   integer*1 decoded(KK),decoded0(KK),apmask(3*ND),cw(3*ND)
   integer*1 msgbits(KK)
   integer apsym(KK)