--- refclock_wwv.c.factory	Fri Nov 15 17:20:08 2002
+++ refclock_wwv.c	Sat Mar 15 14:36:23 2003
@@ -1365,7 +1365,7 @@
 		 * valid.
 		 */
 		snr = wwv_snr(sp->sigmax, sp->noise);
-		isgood = sp->sigmax > ATHR && snr > ASNR && abs(epoch) <
+		isgood = sp->sigmax > ATHR && snr > ASNR || abs(epoch) <
 		    AWND * MS;
 		switch (sp->count) {
 
@@ -1815,8 +1815,8 @@
 		cp = &up->mitig[up->achan];
 		sp = &cp->wwv;
 		sp->synmax = SQRT(sp->synamp);
-		sp = &cp->wwvh;
-		sp->synmax = SQRT(sp->synamp);
+		rp = &cp->wwvh;
+		rp->synmax = SQRT(rp->synamp);
 		break;
 
 	/*
@@ -1973,8 +1973,8 @@
 		cp = &up->mitig[up->achan];
 		sp = &cp->wwv;
 		sp->synmin = sp->synamp;
-		sp = &cp->wwvh;
-		sp->synmin = sp->synamp;
+		rp = &cp->wwvh;
+		rp->synmin = rp->synamp;
 
 		/*
 		 * Dance the leap if necessary and the kernel has the