diff --git a/nmap-os-db b/nmap-os-db
index eed213d73..01266dc61 100644
--- a/nmap-os-db
+++ b/nmap-os-db
@@ -26,7 +26,7 @@
 # Firmware Version 4.30.7, Linux 2.4.20 I believe
 Fingerprint Linksys WRT54GL WAP (Linux kernel)
 Class Class Linksys | Linux | 2.4.X | WAP
-SEQ(SP=BD-CF%GCD=<5%ISR=C4-D3%TI=Z%II=I%TS=7)
+SEQ(SP=BD-CF%GCD=<5%ISR=C4-D4%TI=Z%II=I%TS=7)
 OPS(O1=M5B4ST11NW0%O2=M5B4ST11NW0%O3=M5B4NNT11NW0%O4=M5B4ST11NW0%O5=M5B4ST11NW0%O6=M5B4ST11)
 WIN(W1=16A0%W2=16A0%W3=16A0%W4=16A0%W5=16A0%W6=16A0)
 ECN(R=Y%DF=Y%T=40%TG=40%W=16D0%O=M5B4NNSNW0%CC=N%Q=)
@@ -43,7 +43,7 @@ IE(DFI=N%T=40%TG=40%TOSI=S%CD=S%SI=S%DLI=S)
 # Linux 2.6.12-1.1380_FC3 #1 Wed Oct 19 20:34:13 EDT 2005 i686 i686 i386 GNU/Linux
 Fingerprint Linux 2.6.12-1.1380_FC3 (Fedora Core 3)
 Class Linux | Linux | 2.6.X | general purpose
-SEQ(SP=BB-CF%GCD=<5%ISR=CB-D3%TI=Z%II=I%TS=A)
+SEQ(SP=BB-CF%GCD=<5%ISR=C0-D3%TI=Z%II=I%TS=A)
 OPS(O1=M5B4ST11NW2%O2=M5B4ST11NW2%O3=M5B4NNT11NW2%O4=M5B4ST11NW2%O5=M5B4ST11NW2%O6=M5B4ST11)
 WIN(W1=16A0%W2=16A0%W3=16A0%W4=16A0%W5=16A0%W6=16A0)
 ECN(R=Y%DF=Y%T=40%TG=40%W=16D0%O=M5B4NNSNW2%CC=N%Q=)
@@ -93,13 +93,13 @@ IE(DFI=N%T=40%TG=40%TOSI=S%CD=S%SI=S%DLI=S)
 # Linux 2.6.17-1.2157_FC5 #1 SMP Tue Jul 11 22:53:56 EDT 2006 x86_64 x86_64 x86_64 GNU/Linux
 Fingerprint Linux 2.6.17-1.2157_FC5 (Fedora Core 5)
 Class Linux | Linux | 2.6.X | general purpose
-SEQ(SP=C2-CF%GCD=<7%ISR=C4-D7%TI=Z%II=I%TS=8)
-OPS(O1=M400CST11NW7%O2=M400CST11NW7%O3=M400CNNT11NW7%O4=M400CST11NW7%O5=M400CST11NW7%O6=M400CST11)
-WIN(W1=8000%W2=8000%W3=8000%W4=8000%W5=8000%W6=8000)
-ECN(R=Y%DF=Y%T=40%TG=40%W=8018%O=M400CNNSNW7%CC=N%Q=)
+SEQ(SP=C2-CF%GCD=<5%ISR=C4-D7%TI=Z%II=I%TS=8)
+OPS(O1=M400CST11NW7|M5B4ST11NW7%O2=M400CST11NW7|M5B4ST11NW7%O3=M400CNNT11NW7|M5B4NNT11NW7%O4=M400CST11NW7|M5B4ST11NW7%O5=M400CST11NW7|M5B4ST11NW7%O6=M400CST11|M5B4ST11)
+WIN(W1=8000|16A0%W2=8000|16A0%W3=8000|16A0%W4=8000|16A0%W5=8000|16A0%W6=8000|16A0)
+ECN(R=Y%DF=Y%T=40%TG=40%W=8018|16D0%O=M400CNNSNW7|M5B4NNSNW7%CC=N%Q=)
 T1(R=Y%DF=Y%T=40%TG=40%S=O%A=S+%F=AS%RD=0%Q=)
 T2(R=N)
-T3(R=Y%DF=Y%T=40%TG=40%W=8000%S=O%A=S+%F=AS%O=M400CST11NW7%RD=0%Q=)
+T3(R=Y%DF=Y%T=40%TG=40%W=8000|16A0%S=O%A=S+%F=AS%O=M400CST11NW7|M5B4ST11NW7%RD=0%Q=)
 T4(R=Y%DF=Y%T=40%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
 T5(R=Y%DF=Y%T=40%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
 T6(R=Y%DF=Y%T=40%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
diff --git a/output.cc b/output.cc
index 97730626d..9977d807f 100644
--- a/output.cc
+++ b/output.cc
@@ -738,7 +738,7 @@ void log_vwrite(int logt, const char *fmt, va_list ap) {
   case LOG_SKID:
   case LOG_XML:
 #ifdef WIN32
-	  *apcopy = *ap;
+	  apcopy = ap;
 #else
     va_copy(apcopy, ap); /* Needed in case we need to so a second vnsprintf */
 #endif