diff -urNb nmap-4.20ALPHA2/mswin32/nmap.vcproj nmap-4.20ALPHA2.new/mswin32/nmap.vcproj
--- nmap-4.20ALPHA2/mswin32/nmap.vcproj	2006-05-31 19:01:07.000000000 -0400
+++ nmap-4.20ALPHA2.new/mswin32/nmap.vcproj	2006-06-25 00:57:40.343750000 -0400
@@ -264,6 +264,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\osscan2.cc"
+				>
+			</File>
+			<File
 				RelativePath="..\output.cc"
 				>
 			</File>
@@ -405,6 +409,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\osscan2.h"
+				>
+			</File>
+			<File
 				RelativePath="..\output.h"
 				>
 			</File>
@@ -590,7 +598,7 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Copying $(InputName) to output directory..."
-						CommandLine="copy /y &quot;$(InputPath)&quot; &quot;$(TargetDir)$(InputName)&quot; &gt; nul&#x0D;&#x0A;"
+						CommandLine="copy /y &quot;$(InputPath)&quot; &quot;$(TargetDir)$(InputName)&quot; &gt; nul"
 						Outputs="$(TargetDir)$(InputName)"
 					/>
 				</FileConfiguration>
@@ -600,7 +608,31 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Copying $(InputName) to output directory..."
-						CommandLine="copy /y &quot;$(InputPath)&quot; &quot;$(TargetDir)$(InputName)&quot; &gt; nul&#x0D;&#x0A;"
+						CommandLine="copy /y &quot;$(InputPath)&quot; &quot;$(TargetDir)$(InputName)&quot; &gt; nul"
+						Outputs="$(TargetDir)$(InputName)"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\nmap-os-db"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Copying $(InputName) to output directory..."
+						CommandLine="copy /y &quot;$(InputPath)&quot; &quot;$(TargetDir)$(InputName)&quot; &gt; nul"
+						Outputs="$(TargetDir)$(InputName)"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Copying $(InputName) to output directory..."
+						CommandLine="copy /y &quot;$(InputPath)&quot; &quot;$(TargetDir)$(InputName)&quot; &gt; nul"
 						Outputs="$(TargetDir)$(InputName)"
 					/>
 				</FileConfiguration>
@@ -614,7 +646,7 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Copying $(InputName) to output directory..."
-						CommandLine="copy /y &quot;$(InputPath)&quot; &quot;$(TargetDir)$(InputName)&quot; &gt; nul&#x0D;&#x0A;"
+						CommandLine="copy /y &quot;$(InputPath)&quot; &quot;$(TargetDir)$(InputName)&quot; &gt; nul"
 						Outputs="$(TargetDir)$(InputName)"
 					/>
 				</FileConfiguration>
@@ -624,7 +656,7 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Copying $(InputName) to output directory..."
-						CommandLine="copy /y &quot;$(InputPath)&quot; &quot;$(TargetDir)$(InputName)&quot; &gt; nul&#x0D;&#x0A;"
+						CommandLine="copy /y &quot;$(InputPath)&quot; &quot;$(TargetDir)$(InputName)&quot; &gt; nul"
 						Outputs="$(TargetDir)$(InputName)"
 					/>
 				</FileConfiguration>
@@ -638,7 +670,7 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Copying $(InputName) to output directory..."
-						CommandLine="copy /y &quot;$(InputPath)&quot; &quot;$(TargetDir)$(InputName)&quot; &gt; nul&#x0D;&#x0A;"
+						CommandLine="copy /y &quot;$(InputPath)&quot; &quot;$(TargetDir)$(InputName)&quot; &gt; nul"
 						Outputs="$(TargetDir)$(InputName)"
 					/>
 				</FileConfiguration>
@@ -648,7 +680,7 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Copying $(InputName) to output directory..."
-						CommandLine="copy /y &quot;$(InputPath)&quot; &quot;$(TargetDir)$(InputName)&quot; &gt; nul&#x0D;&#x0A;"
+						CommandLine="copy /y &quot;$(InputPath)&quot; &quot;$(TargetDir)$(InputName)&quot; &gt; nul"
 						Outputs="$(TargetDir)$(InputName)"
 					/>
 				</FileConfiguration>
@@ -662,7 +694,7 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Copying $(InputName) to output directory..."
-						CommandLine="copy /y &quot;$(InputPath)&quot; &quot;$(TargetDir)$(InputName)&quot; &gt; nul&#x0D;&#x0A;"
+						CommandLine="copy /y &quot;$(InputPath)&quot; &quot;$(TargetDir)$(InputName)&quot; &gt; nul"
 						Outputs="$(TargetDir)$(InputName)"
 					/>
 				</FileConfiguration>
@@ -672,7 +704,7 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Copying $(InputName) to output directory..."
-						CommandLine="copy /y &quot;$(InputPath)&quot; &quot;$(TargetDir)$(InputName)&quot; &gt; nul&#x0D;&#x0A;"
+						CommandLine="copy /y &quot;$(InputPath)&quot; &quot;$(TargetDir)$(InputName)&quot; &gt; nul"
 						Outputs="$(TargetDir)$(InputName)"
 					/>
 				</FileConfiguration>
@@ -686,7 +718,7 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Copying $(InputName) to output directory..."
-						CommandLine="copy /y &quot;$(InputPath)&quot; &quot;$(TargetDir)$(InputName)&quot; &gt; nul&#x0D;&#x0A;"
+						CommandLine="copy /y &quot;$(InputPath)&quot; &quot;$(TargetDir)$(InputName)&quot; &gt; nul"
 						Outputs="$(TargetDir)$(InputName)"
 					/>
 				</FileConfiguration>
@@ -696,7 +728,7 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Copying $(InputName) to output directory..."
-						CommandLine="copy /y &quot;$(InputPath)&quot; &quot;$(TargetDir)$(InputName)&quot; &gt; nul&#x0D;&#x0A;"
+						CommandLine="copy /y &quot;$(InputPath)&quot; &quot;$(TargetDir)$(InputName)&quot; &gt; nul"
 						Outputs="$(TargetDir)$(InputName)"
 					/>
 				</FileConfiguration>
@@ -710,7 +742,7 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Copying $(InputName) to output directory..."
-						CommandLine="copy /y &quot;$(InputPath)&quot; &quot;$(TargetDir)$(InputName)&quot; &gt; nul&#x0D;&#x0A;"
+						CommandLine="copy /y &quot;$(InputPath)&quot; &quot;$(TargetDir)$(InputName)&quot; &gt; nul"
 						Outputs="$(TargetDir)$(InputName)"
 					/>
 				</FileConfiguration>
@@ -720,7 +752,7 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Copying $(InputName) to output directory..."
-						CommandLine="copy /y &quot;$(InputPath)&quot; &quot;$(TargetDir)$(InputName)&quot; &gt; nul&#x0D;&#x0A;"
+						CommandLine="copy /y &quot;$(InputPath)&quot; &quot;$(TargetDir)$(InputName)&quot; &gt; nul"
 						Outputs="$(TargetDir)$(InputName)"
 					/>
 				</FileConfiguration>
@@ -733,9 +765,9 @@
 					>
 					<Tool
 						Name="VCCustomBuildTool"
-						Description="Copying $(InputName) to output directory..."
-						CommandLine="copy /y &quot;$(InputPath)&quot; &quot;$(TargetDir)$(InputName)&quot; &gt; nul&#x0D;&#x0A;"
-						Outputs="$(TargetDir)$(InputName)"
+						Description="Copying $(InputName).xsl to output directory..."
+						CommandLine="copy /y &quot;$(InputPath)&quot; &quot;$(TargetDir)$(InputName).xsl&quot; &gt; nul"
+						Outputs="$(TargetDir)$(InputName).xsl"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -744,8 +776,8 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Copying $(InputName).xsl to output directory..."
-						CommandLine="copy /y &quot;$(InputPath)&quot; &quot;$(TargetDir)$(InputName).xsl&quot; &gt; nul&#x0D;&#x0A;"
-						Outputs="$(TargetDir)$(InputName)"
+						CommandLine="copy /y &quot;$(InputPath)&quot; &quot;$(TargetDir)$(InputName).xsl&quot; &gt; nul"
+						Outputs="$(TargetDir)$(InputName).xsl"
 					/>
 				</FileConfiguration>
 			</File>
diff -urNb nmap-4.20ALPHA2/osscan2.cc nmap-4.20ALPHA2.new/osscan2.cc
--- nmap-4.20ALPHA2/osscan2.cc	2006-06-24 23:56:23.000000000 -0400
+++ nmap-4.20ALPHA2.new/osscan2.cc	2006-06-25 00:45:25.625000000 -0400
@@ -1523,7 +1523,7 @@
       hss->si.index = (unsigned int) (0.5 + pow(seq_inc_sum, 0.5));
 #endif
 
-	  hss->si.index = (unsigned int) (0.5 + log(hss->si.index)/log(2));
+	  hss->si.index = (unsigned int) (0.5 + log((float)hss->si.index)/log(2.0));
 		
       /*       printf("The sequence index is %d\n", hss->si.index);*/
       if (hss->si.index < 6) {
@@ -1635,7 +1635,7 @@
 	case TS_SEQ_OTHER_NUM:
       seq_AVs[avnum].next = &seq_AVs[avnum+1]; avnum++;
       seq_AVs[avnum].attribute = "TS";
-	  sprintf(seq_AVs[avnum].value, "%X", (unsigned int)(0.5 + log(avg_ts_hz)/log(2)));
+	  sprintf(seq_AVs[avnum].value, "%X", (unsigned int)(0.5 + log(avg_ts_hz)/log(2.0)));
       break;
     case TS_SEQ_UNSUPPORTED:
       seq_AVs[avnum].next = &seq_AVs[avnum+1]; avnum++;
@@ -2556,7 +2556,7 @@
 
 #ifdef WIN32
     if (Targets[targetno]->ifType() == devt_loopback) {
-      log_write(LOG_STDOUT, "Skipping OS Scan against %s because it doesn't work against your own machine (localhsot)\n", target->NameIP());
+      log_write(LOG_STDOUT, "Skipping OS Scan against %s because it doesn't work against your own machine (localhsot)\n", Targets[targetno]->NameIP());
       continue;
     }
 #endif