diff --git a/nmap-os-db b/nmap-os-db
index 530fef96d..1da38810c 100644
--- a/nmap-os-db
+++ b/nmap-os-db
@@ -74,20 +74,20 @@ T7(R=Y%DF=Y%T=40%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
 U1(DF=N%T=40%TG=40%TOS=C0%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUL=G%RUD=G)
 IE(DFI=N%T=40%TG=40%TOSI=S%CD=S%SI=S%DLI=S)
 
-# Taken on an SMP machine
+# Taken on an X86 SMP machine
 Fingerprint Microsoft Windows 2000 SP4
 Class Microsoft | Windows | 2000 | general purpose
-SEQ(SP=60-71%GCD=<5%ISR=98%TI=I%II=I%SS=S)
+SEQ(SP=60-75%GCD=<5%ISR=98-9F%TI=I%II=I%SS=S)
 OPS(O1=M5B4NW0NNT00NNS%O2=M5B4NW0NNT00NNS%O3=M5B4NW0NNT00%O4=M5B4NW0NNT00NNS%O5=M5B4NW0NNT00NNS%O6=M5B4NNT00NNS)
 WIN(W1=FFFF%W2=FFFF%W3=FFFF%W4=FFFF%W5=FFFF%W6=FFFF)
 ECN(R=Y%DF=Y%T=80%TG=80%W=FFFF%O=M5B4NW0NNS%CC=N%Q=)
-T1(R=Y%DF=Y%T=80%TG=80%S=O%A=S+%F=AS%RD=0%Q=)
+T1(R=Y%DF=Y%T=80%TG=80%S=O%A=S+|S+|S+|S+|S+%F=AS%RD=0%Q=)
 T2(R=Y%DF=N%T=80%TG=80%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=)
-T3(R=Y%DF=Y%T=80%TG=80%W=FFFF%S=O%A=S+%F=AS%O=M5B4NW0NNT00NNS%RD=0%Q=)
+T3(R=Y%DF=Y%T=80%TG=80%W=FFFF%S=O%A=S+|S+|S+|S+|S+%F=AS%O=M5B4NW0NNT00NNS%RD=0%Q=)
 T4(R=Y%DF=N%T=80%TG=80%W=0%S=A%A=O%F=R%O=%RD=0%Q=)
-T5(R=Y%DF=N%T=80%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+T5(R=Y%DF=N%T=80%TG=80%W=0%S=Z%A=S+|S+|S+|S+|S+%F=AR%O=%RD=0%Q=)
 T6(R=Y%DF=N%T=80%TG=80%W=0%S=A%A=O%F=R%O=%RD=0%Q=)
-T7(R=Y%DF=N%T=80%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+T7(R=Y%DF=N%T=80%TG=80%W=0%S=Z%A=S+|S+|S+|S+|S+%F=AR%O=%RD=0%Q=)
 U1(DF=N%T=80%TG=80%TOS=0%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUL=G%RUD=G)
 IE(DFI=S%T=80%TG=80%TOSI=Z%CD=Z%SI=S%DLI=S)
 
diff --git a/osscan2.cc b/osscan2.cc
index dc640bb0b..302644c00 100644
--- a/osscan2.cc
+++ b/osscan2.cc
@@ -1697,14 +1697,14 @@ void HostOsScan::makeTSeqFP(HostOsScanStats *hss) {
     } else {
 
       /* First calculate the average counter rate */
-      for(i=0; i < hss->si.responses - 1; i++) {      
+      for(i=0; i < hss->si.responses - 1; i++) {
 	seq_rate += seq_diffs[i] / (TIMEVAL_MSEC_SUBTRACT(hss->seq_send_times[i+1], hss->seq_send_times[i]) / 1000.0);
       }
       seq_rate /= hss->si.responses - 1;
       /* Finally we take a binary logarithm, multiply by 8, and round
 	 to get the final result */
       seq_rate = log(seq_rate) / log(2);
-      seq_rate = (unsigned int) seq_rate * 8 + 0.5;
+      seq_rate = (unsigned int) (seq_rate * 8 + 0.5);
 
       /* Now calculate the predictability index */
       for(i=0; i < hss->si.responses - 1; i++)