diff --git a/lib/q65_decode.f90 b/lib/q65_decode.f90
index 583d50ebd..029d399d9 100644
--- a/lib/q65_decode.f90
+++ b/lib/q65_decode.f90
@@ -140,7 +140,6 @@ contains
 !3060      format(a1,i1,1x,13b6.6/3x,13i6)
 !          write(72,3060) 'B',ipass,apsymbols,apsymbols
        endif
-
        call timer('q65loops',0)
        call q65_loops(c00,npts/2,nsps/2,nmode,mode65,nsubmode,nFadingModel,  &
             ndepth,jpk0,xdt,f0,width,ipass,apmask,apsymbols,snr2,irc,dat4)
diff --git a/lib/qra/q65/q65_loops.f90 b/lib/qra/q65/q65_loops.f90
index b468b00ce..8fef412d4 100644
--- a/lib/qra/q65/q65_loops.f90
+++ b/lib/qra/q65/q65_loops.f90
@@ -69,8 +69,6 @@ subroutine q65_loops(c00,npts2,nsps,mode,mode64,nsubmode,nFadingModel,   &
               ncall=ncall+1
               call timer('qra64_de',0)
               call q65_intrinsics_ff(s3,nsubmode,b90,nFadingModel,s3prob)
-!              APmask=0
-!              APsymbols=0
               call q65_dec(s3,s3prob,APmask,APsymbols,snr2,dat4,irc)
               ! irc > 0 ==> number of iterations required to decode
               !  -1 = invalid params
diff --git a/lib/sync_q65.f90 b/lib/sync_q65.f90
index 8df6da47f..c52cca12f 100644
--- a/lib/sync_q65.f90
+++ b/lib/sync_q65.f90
@@ -74,13 +74,15 @@ subroutine sync_q65(iwave,nmax,mode65,nsps,nfqso,ntol,xdt,f0,snr1)
   enddo
 
   dtstep=nsps/(NSTEP*12000.0)                 !Step size in seconds
-  j0=0.5/dtstep
-  if(nsps.ge.6192) j0=1.0/dtstep              !Nominal index for start of signal
-  
-  ccf=0.
   ia=min(64,nint(ntol/df))
   lag1=-1.0/dtstep
-  lag2=4.0/dtstep + 0.9999
+  lag2=1.0/dtstep + 0.9999
+  j0=0.5/dtstep
+  if(nsps.ge.6192) then
+     j0=1.0/dtstep              !Nominal index for start of signal
+     lag2=4.0/dtstep + 0.9999   !Include EME delays
+  endif
+  ccf=0.
 
   do lag=lag1,lag2
      do k=1,85