diff --git a/map65/libm65/map65a.f90 b/map65/libm65/map65a.f90
index d18884c9d..e45aec9ef 100644
--- a/map65/libm65/map65a.f90
+++ b/map65/libm65/map65a.f90
@@ -359,7 +359,7 @@ subroutine map65a(dd,ss,savg,newdat,nutc,fcenter,ntol,idphi,nfa,nfb,        &
         flush(6)
      endif
      if(nqd.eq.2 .and. mode65.eq.0) go to 999
-     if(nagain.eq.1 .and. nqd.eq.1) go to 999
+     if(nqd.eq.1 .and. nagain.eq.1) go to 999
   enddo
 
 !  Trim the list and produce a sorted index and sizes of groups.
@@ -469,6 +469,7 @@ subroutine map65a(dd,ss,savg,newdat,nutc,fcenter,ntol,idphi,nfa,nfb,        &
      endif
      j=j+nsiz(n)
   enddo  !i=1,km
+
   write(26,1015) nutc
 1015 format(37x,i6.4,' ')
   call flush(21)
diff --git a/map65/libm65/q65b.f90 b/map65/libm65/q65b.f90
index 6c547188a..931d73171 100644
--- a/map65/libm65/q65b.f90
+++ b/map65/libm65/q65b.f90
@@ -143,9 +143,9 @@ subroutine q65b(nutc,fcenter,nfcal,nfsample,ikhz,mousedf,ntol,xpol,  &
 1100 format(a)
 
 ! Should write to lu 26 here, for Messages and Band Map windows ?
-!     write(26,1014) freq0,nfreq0,0,0,0,xdt0,ipol0,0,                   &
-!          nsnr0,nutc,msg40(1:22),' ',char(ichar('A') + mode_q65-1)
-!1014 format(f8.3,i5,3i3,f5.1,i4,i3,i4,i5.4,4x,a22,2x,a1,3x,':',a1)
+     write(26,1014) freq0,nfreq0,0,0,0,xdt0,ipol0,0,                   &
+          nsnr0,nutc,msg0(1:22),'Q',char(ichar('A') + mode_q65-1)
+1014 format(f8.3,i5,3i3,f5.1,i4,i3,i4,i5.4,4x,a22,2x,a1,3x,':',a1)
 
 ! Write to file map65_rx.log:
      write(21,1110)  freq0,nfreq,xdt0,45*(ipol-1),nsnr0,nutc,msg0(1:28),cq0