diff --git a/flow/flow.vcxproj b/flow/flow.vcxproj
index 1e465074a8..b3c3e252c8 100644
--- a/flow/flow.vcxproj
+++ b/flow/flow.vcxproj
@@ -1,207 +1,207 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|X64">
-      <Configuration>Debug</Configuration>
-      <Platform>X64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|X64">
-      <Configuration>Release</Configuration>
-      <Platform>X64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <ItemGroup>
-    <ActorCompiler Include="ActorCollection.actor.cpp" />
-    <ActorCompiler Include="CompressedInt.actor.cpp" />
-    <ClCompile Include="boost.cpp" />
-    <ClCompile Include="Deque.cpp" />
-    <ClCompile Include="Error.cpp" />
-    <ClCompile Include="FastAlloc.cpp" />
-    <ClCompile Include="FaultInjection.cpp" />
-    <ClCompile Include="FileTraceLogWriter.cpp" />
-    <ClCompile Include="XmlTraceLogFormatter.cpp" />
-    <ClInclude Include="FileTraceLogWriter.h" />
-    <ClInclude Include="XmlTraceLogFormatter.h" />
-    <ClInclude Include="MetricSample.h" />
-    <ClInclude Include="Profiler.h" />
-    <ActorCompiler Include="Profiler.actor.cpp" />
-    <ActorCompiler Include="Net2.actor.cpp" />
-    <ClCompile Include="IThreadPool.cpp" />
-    <ClCompile Include="network.cpp" />
-    <ClCompile Include="flow.cpp" />
-    <ActorCompiler Include="genericactors.actor.cpp" />
-    <ClCompile Include="Hash3.c" />
-    <ClCompile Include="IndexedSet.cpp" />
-    <ClCompile Include="Knobs.cpp" />
-    <ClCompile Include="Net2Packet.cpp" />
-    <ActorCompiler Include="Stats.actor.cpp" />
-    <ClCompile Include="SystemMonitor.cpp" />
-    <ClCompile Include="TDMetric.cpp" />
-    <ClCompile Include="ThreadHelper.cpp" />
-    <ClCompile Include="ThreadPrimitives.cpp" />
-    <ClCompile Include="Platform.cpp" />
-    <ClCompile Include="stacktrace.amalgamation.cpp" />
-    <ClCompile Include="Trace.cpp" />
-    <ClCompile Include="UnitTest.cpp" />
-    <ClCompile Include="version.cpp" />
-    <ClCompile Include="SignalSafeUnwind.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="CompressedInt.h" />
-    <ClInclude Include="ActorCollection.h" />
-    <ClInclude Include="actorcompiler.h" />
-    <ClInclude Include="Arena.h" />
-    <ClInclude Include="AsioReactor.h" />
-    <ClInclude Include="Deque.h" />
-    <ClInclude Include="DeterministicRandom.h" />
-    <ClInclude Include="Error.h" />
-    <ClInclude Include="error_definitions.h" />
-    <ClInclude Include="FastAlloc.h" />
-    <ClInclude Include="FastRef.h" />
-    <ClInclude Include="FaultInjection.h" />
-    <ClInclude Include="network.h" />
-    <ClInclude Include="flow.h" />
-    <ActorCompiler Include="EventTypes.actor.h">
-      <EnableCompile>false</EnableCompile>
-      <EnableCompile>false</EnableCompile>
-    </ActorCompiler>
-    <ActorCompiler Include="genericactors.actor.h">
-      <EnableCompile>false</EnableCompile>
-    </ActorCompiler>
-    <ClInclude Include="Hash3.h" />
-    <ActorCompiler Include="IndexedSet.actor.h">
-      <EnableCompile>false</EnableCompile>
-    </ActorCompiler>
-    <ClInclude Include="IDispatched.h" />
-    <ClInclude Include="IndexedSet.h" />
-    <ClInclude Include="IRandom.h" />
-    <ClInclude Include="IThreadPool.h" />
-    <ClInclude Include="Knobs.h" />
-    <ClInclude Include="Net2Packet.h" />
-    <ClInclude Include="serialize.h" />
-    <ClInclude Include="SimpleOpt.h" />
-    <ClInclude Include="stacktrace.h" />
-    <ClInclude Include="Stats.h" />
-    <ClInclude Include="SystemMonitor.h" />
-    <ClInclude Include="ThreadPrimitives.h" />
-    <ClInclude Include="Platform.h" />
-    <ClInclude Include="ThreadSafeQueue.h" />
-    <ClInclude Include="Trace.h" />
-    <ClInclude Include="SignalSafeUnwind.h" />
-    <ClInclude Include="UnitTest.h" />
-    <ActorCompiler Include="ThreadHelper.actor.h">
-      <EnableCompile>false</EnableCompile>
-    </ActorCompiler>
-    <ActorCompiler Include="TDMetric.actor.h">
-      <EnableCompile>false</EnableCompile>
-    </ActorCompiler>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="no_intellisense.opt" />
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGUID>{00AC9087-0378-4872-9992-DF267CF12ACB}</ProjectGUID>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>flow</RootNamespace>
-  </PropertyGroup>
-  <PropertyGroup>
-    <OutDir>$(SolutionDir)bin\$(Configuration)\</OutDir>
-    <IntDir>$(SystemDrive)\temp\msvcfdb\$(Platform)$(Configuration)\$(MSBuildProjectName)\</IntDir>
-    <BuildLogFile>$(IntDir)\$(MSBuildProjectName).log</BuildLogFile>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|X64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140_xp</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|X64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140_xp</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(LocalAppData)\Microsoft\VisualStudio\10.0\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(LocalAppData)\Microsoft\VisualStudio\10.0\Microsoft.Cpp.$(Platform).user.props')" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">
-    <LinkIncremental>true</LinkIncremental>
-    <IncludePath>$(IncludePath);../;C:\Program Files\boost_1_52_0</IncludePath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|X64'">
-    <LinkIncremental>false</LinkIncremental>
-    <IncludePath>$(IncludePath);../;C:\Program Files\boost_1_52_0</IncludePath>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-    <PreBuildEvent>
-      <Command>echo const char *hgVersion = "Current version id not currently supported within Windows."; &gt; hgVersion.temp.h &amp;&amp; fc /b hgVersion.temp.h hgVersion.h &gt; nul || copy hgVersion.temp.h hgVersion.h &gt; nul</Command>
-      <Message>Checking HG source version</Message>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <MinimalRebuild>false</MinimalRebuild>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <Optimization>Disabled</Optimization>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PreprocessorDefinitions>WIN32;_WIN32_WINNT=0x0502;WINVER=0x0502;NTDDI_VERSION=0x05020000;_DEBUG;_HAS_ITERATOR_DEBUGGING=0;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <AdditionalOptions>/bigobj @../flow/no_intellisense.opt %(AdditionalOptions)</AdditionalOptions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>Advapi32.lib</AdditionalDependencies>
-    </Link>
-    <Lib>
-      <AdditionalDependencies>psapi.lib</AdditionalDependencies>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|X64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <Optimization>Full</Optimization>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;_WIN32_WINNT=0x0502;WINVER=0x0502;NTDDI_VERSION=0x05020000;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;FDB_CLEAN_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
-      <EnablePREfast>false</EnablePREfast>
-      <AdditionalOptions>/bigobj @../flow/no_intellisense.opt %(AdditionalOptions)</AdditionalOptions>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <MinimalRebuild>false</MinimalRebuild>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>false</EnableCOMDATFolding>
-      <OptimizeReferences>false</OptimizeReferences>
-      <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
-      <AdditionalDependencies>Advapi32.lib</AdditionalDependencies>
-      <AdditionalOptions>/LTCG %(AdditionalOptions)</AdditionalOptions>
-    </Link>
-    <Lib>
-      <AdditionalDependencies>psapi.lib</AdditionalDependencies>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ImportGroup Label="ExtensionTargets">
-    <Import Project="actorcompiler\ActorCompiler.targets" />
-  </ImportGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <Target Name="MyPreCompileSteps" AfterTargets="CLCompile">
-    <Exec Command="$(SolutionDir)bin\$(Configuration)\coveragetool.exe &quot;$(OutDir)coverage.$(TargetName).xml&quot; @(ActorCompiler -> '%(RelativeDir)%(Filename)%(Extension)', ' ') @(CLInclude -> '%(RelativeDir)%(Filename)%(Extension)', ' ') @(CLCompile -> '%(RelativeDir)%(Filename)%(Extension)', ' ')" />
-  </Target>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|X64">
+      <Configuration>Debug</Configuration>
+      <Platform>X64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|X64">
+      <Configuration>Release</Configuration>
+      <Platform>X64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <ItemGroup>
+    <ActorCompiler Include="ActorCollection.actor.cpp" />
+    <ActorCompiler Include="CompressedInt.actor.cpp" />
+    <ClCompile Include="boost.cpp" />
+    <ClCompile Include="Deque.cpp" />
+    <ClCompile Include="Error.cpp" />
+    <ClCompile Include="FastAlloc.cpp" />
+    <ClCompile Include="FaultInjection.cpp" />
+    <ClCompile Include="FileTraceLogWriter.cpp" />
+    <ClCompile Include="XmlTraceLogFormatter.cpp" />
+    <ClInclude Include="FileTraceLogWriter.h" />
+    <ClInclude Include="XmlTraceLogFormatter.h" />
+    <ClInclude Include="MetricSample.h" />
+    <ClInclude Include="Profiler.h" />
+    <ActorCompiler Include="Profiler.actor.cpp" />
+    <ActorCompiler Include="Net2.actor.cpp" />
+    <ClCompile Include="IThreadPool.cpp" />
+    <ClCompile Include="network.cpp" />
+    <ClCompile Include="flow.cpp" />
+    <ActorCompiler Include="genericactors.actor.cpp" />
+    <ClCompile Include="Hash3.c" />
+    <ClCompile Include="IndexedSet.cpp" />
+    <ClCompile Include="Knobs.cpp" />
+    <ClCompile Include="Net2Packet.cpp" />
+    <ActorCompiler Include="Stats.actor.cpp" />
+    <ClCompile Include="SystemMonitor.cpp" />
+    <ClCompile Include="TDMetric.cpp" />
+    <ClCompile Include="ThreadHelper.cpp" />
+    <ClCompile Include="ThreadPrimitives.cpp" />
+    <ClCompile Include="Platform.cpp" />
+    <ClCompile Include="stacktrace.amalgamation.cpp" />
+    <ClCompile Include="Trace.cpp" />
+    <ClCompile Include="UnitTest.cpp" />
+    <ClCompile Include="version.cpp" />
+    <ClCompile Include="SignalSafeUnwind.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="CompressedInt.h" />
+    <ClInclude Include="ActorCollection.h" />
+    <ClInclude Include="actorcompiler.h" />
+    <ClInclude Include="Arena.h" />
+    <ClInclude Include="AsioReactor.h" />
+    <ClInclude Include="Deque.h" />
+    <ClInclude Include="DeterministicRandom.h" />
+    <ClInclude Include="Error.h" />
+    <ClInclude Include="error_definitions.h" />
+    <ClInclude Include="FastAlloc.h" />
+    <ClInclude Include="FastRef.h" />
+    <ClInclude Include="FaultInjection.h" />
+    <ClInclude Include="network.h" />
+    <ClInclude Include="flow.h" />
+    <ActorCompiler Include="EventTypes.actor.h">
+      <EnableCompile>false</EnableCompile>
+      <EnableCompile>false</EnableCompile>
+    </ActorCompiler>
+    <ActorCompiler Include="genericactors.actor.h">
+      <EnableCompile>false</EnableCompile>
+    </ActorCompiler>
+    <ClInclude Include="Hash3.h" />
+    <ActorCompiler Include="IndexedSet.actor.h">
+      <EnableCompile>false</EnableCompile>
+    </ActorCompiler>
+    <ClInclude Include="IDispatched.h" />
+    <ClInclude Include="IndexedSet.h" />
+    <ClInclude Include="IRandom.h" />
+    <ClInclude Include="IThreadPool.h" />
+    <ClInclude Include="Knobs.h" />
+    <ClInclude Include="Net2Packet.h" />
+    <ClInclude Include="serialize.h" />
+    <ClInclude Include="SimpleOpt.h" />
+    <ClInclude Include="stacktrace.h" />
+    <ClInclude Include="Stats.h" />
+    <ClInclude Include="SystemMonitor.h" />
+    <ClInclude Include="ThreadPrimitives.h" />
+    <ClInclude Include="Platform.h" />
+    <ClInclude Include="ThreadSafeQueue.h" />
+    <ClInclude Include="Trace.h" />
+    <ClInclude Include="SignalSafeUnwind.h" />
+    <ClInclude Include="UnitTest.h" />
+    <ActorCompiler Include="ThreadHelper.actor.h">
+      <EnableCompile>false</EnableCompile>
+    </ActorCompiler>
+    <ActorCompiler Include="TDMetric.actor.h">
+      <EnableCompile>false</EnableCompile>
+    </ActorCompiler>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="no_intellisense.opt" />
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGUID>{00AC9087-0378-4872-9992-DF267CF12ACB}</ProjectGUID>
+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>flow</RootNamespace>
+  </PropertyGroup>
+  <PropertyGroup>
+    <OutDir>$(SolutionDir)bin\$(Configuration)\</OutDir>
+    <IntDir>$(SystemDrive)\temp\msvcfdb\$(Platform)$(Configuration)\$(MSBuildProjectName)\</IntDir>
+    <BuildLogFile>$(IntDir)\$(MSBuildProjectName).log</BuildLogFile>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|X64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v140_xp</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|X64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v140_xp</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets">
+    <Import Project="$(LocalAppData)\Microsoft\VisualStudio\10.0\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(LocalAppData)\Microsoft\VisualStudio\10.0\Microsoft.Cpp.$(Platform).user.props')" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">
+    <LinkIncremental>true</LinkIncremental>
+    <IncludePath>$(IncludePath);../;C:\Program Files\boost_1_52_0</IncludePath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|X64'">
+    <LinkIncremental>false</LinkIncremental>
+    <IncludePath>$(IncludePath);../;C:\Program Files\boost_1_52_0</IncludePath>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <PreBuildEvent>
+      <Command>echo const char *hgVersion = "Current version id not currently supported within Windows."; &gt; hgVersion.temp.h &amp;&amp; fc /b hgVersion.temp.h hgVersion.h &gt; nul || copy hgVersion.temp.h hgVersion.h &gt; nul</Command>
+      <Message>Checking HG source version</Message>
+    </PreBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <MinimalRebuild>false</MinimalRebuild>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <Optimization>Disabled</Optimization>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PreprocessorDefinitions>WIN32;_WIN32_WINNT=0x0502;WINVER=0x0502;NTDDI_VERSION=0x05020000;_DEBUG;_HAS_ITERATOR_DEBUGGING=0;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <AdditionalOptions>/bigobj @../flow/no_intellisense.opt %(AdditionalOptions)</AdditionalOptions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>Advapi32.lib</AdditionalDependencies>
+    </Link>
+    <Lib>
+      <AdditionalDependencies>psapi.lib</AdditionalDependencies>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|X64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <Optimization>Full</Optimization>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;_WIN32_WINNT=0x0502;WINVER=0x0502;NTDDI_VERSION=0x05020000;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;FDB_CLEAN_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
+      <EnablePREfast>false</EnablePREfast>
+      <AdditionalOptions>/bigobj @../flow/no_intellisense.opt %(AdditionalOptions)</AdditionalOptions>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <MinimalRebuild>false</MinimalRebuild>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>false</EnableCOMDATFolding>
+      <OptimizeReferences>false</OptimizeReferences>
+      <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
+      <AdditionalDependencies>Advapi32.lib</AdditionalDependencies>
+      <AdditionalOptions>/LTCG %(AdditionalOptions)</AdditionalOptions>
+    </Link>
+    <Lib>
+      <AdditionalDependencies>psapi.lib</AdditionalDependencies>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ImportGroup Label="ExtensionTargets">
+    <Import Project="actorcompiler\ActorCompiler.targets" />
+  </ImportGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <Target Name="MyPreCompileSteps" AfterTargets="CLCompile">
+    <Exec Command="$(SolutionDir)bin\$(Configuration)\coveragetool.exe &quot;$(OutDir)coverage.$(TargetName).xml&quot; @(ActorCompiler -> '%(RelativeDir)%(Filename)%(Extension)', ' ') @(CLInclude -> '%(RelativeDir)%(Filename)%(Extension)', ' ') @(CLCompile -> '%(RelativeDir)%(Filename)%(Extension)', ' ')" />
+  </Target>
+</Project>
diff --git a/flow/flow.vcxproj.filters b/flow/flow.vcxproj.filters
index 1513864ce3..875aab1086 100644
--- a/flow/flow.vcxproj.filters
+++ b/flow/flow.vcxproj.filters
@@ -1,83 +1,83 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ActorCompiler Include="ActorCollection.actor.cpp" />
-    <ActorCompiler Include="ThreadHelper.actor.h" />
-    <ActorCompiler Include="IndexedSet.actor.h" />
-    <ActorCompiler Include="Stats.actor.cpp" />
-    <ActorCompiler Include="Net2.actor.cpp" />
-    <ActorCompiler Include="genericactors.actor.cpp" />
-    <ActorCompiler Include="genericactors.actor.h" />
-    <ActorCompiler Include="Profiler.actor.cpp" />
-    <ActorCompiler Include="EventTypes.actor.h" />
-    <ActorCompiler Include="CompressedInt.actor.cpp" />
-    <ActorCompiler Include="TDMetric.actor.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="boost.cpp" />
-    <ClCompile Include="Error.cpp" />
-    <ClCompile Include="FastAlloc.cpp" />
-    <ClCompile Include="Hash3.c" />
-    <ClCompile Include="IndexedSet.cpp" />
-    <ClCompile Include="SystemMonitor.cpp" />
-    <ClCompile Include="ThreadPrimitives.cpp" />
-    <ClCompile Include="Platform.cpp" />
-    <ClCompile Include="Trace.cpp" />
-    <ClCompile Include="Knobs.cpp" />
-    <ClCompile Include="TDMetric.cpp" />
-    <ClCompile Include="UnitTest.cpp" />
-    <ClCompile Include="Deque.cpp" />
-    <ClCompile Include="flow.cpp" />
-    <ClCompile Include="FaultInjection.cpp" />
-    <ClCompile Include="IThreadPool.cpp" />
-    <ClCompile Include="network.cpp" />
-    <ClCompile Include="Net2Packet.cpp" />
-    <ClCompile Include="ThreadHelper.cpp" />
-    <ClCompile Include="version.cpp" />
-    <ClCompile Include="stacktrace.amalgamation.cpp" />
-    <ClCompile Include="SignalSafeUnwind.cpp" />
-    <ClCompile Include="XmlTraceLogFormatter.cpp" />
-    <ClCompile Include="FileTraceLogWriter.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="ActorCollection.h" />
-    <ClInclude Include="actorcompiler.h" />
-    <ClInclude Include="Arena.h" />
-    <ClInclude Include="DeterministicRandom.h" />
-    <ClInclude Include="Error.h" />
-    <ClInclude Include="error_definitions.h" />
-    <ClInclude Include="FastAlloc.h" />
-    <ClInclude Include="FastRef.h" />
-    <ClInclude Include="Hash3.h" />
-    <ClInclude Include="IndexedSet.h" />
-    <ClInclude Include="IRandom.h" />
-    <ClInclude Include="IThreadPool.h" />
-    <ClInclude Include="serialize.h" />
-    <ClInclude Include="SimpleOpt.h" />
-    <ClInclude Include="SystemMonitor.h" />
-    <ClInclude Include="ThreadPrimitives.h" />
-    <ClInclude Include="Platform.h" />
-    <ClInclude Include="Trace.h" />
-    <ClInclude Include="ThreadSafeQueue.h" />
-    <ClInclude Include="Knobs.h" />
-    <ClInclude Include="UnitTest.h" />
-    <ClInclude Include="Stats.h" />
-    <ClInclude Include="Deque.h" />
-    <ClInclude Include="IDispatched.h" />
-    <ClInclude Include="flow.h" />
-    <ClInclude Include="FaultInjection.h" />
-    <ClInclude Include="network.h" />
-    <ClInclude Include="AsioReactor.h" />
-    <ClInclude Include="Net2Packet.h" />
-    <ClInclude Include="Profiler.h" />
-    <ClInclude Include="CompressedInt.h" />
-    <ClInclude Include="SignalSafeUnwind.h" />
-    <ClInclude Include="MetricSample.h" />
-    <ClInclude Include="stacktrace.h" />
-    <ClInclude Include="XmlTraceLogFormatter.h" />
-    <ClInclude Include="FileTraceLogWriter.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="no_intellisense.opt" />
-  </ItemGroup>
-</Project>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <ActorCompiler Include="ActorCollection.actor.cpp" />
+    <ActorCompiler Include="ThreadHelper.actor.h" />
+    <ActorCompiler Include="IndexedSet.actor.h" />
+    <ActorCompiler Include="Stats.actor.cpp" />
+    <ActorCompiler Include="Net2.actor.cpp" />
+    <ActorCompiler Include="genericactors.actor.cpp" />
+    <ActorCompiler Include="genericactors.actor.h" />
+    <ActorCompiler Include="Profiler.actor.cpp" />
+    <ActorCompiler Include="EventTypes.actor.h" />
+    <ActorCompiler Include="CompressedInt.actor.cpp" />
+    <ActorCompiler Include="TDMetric.actor.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="boost.cpp" />
+    <ClCompile Include="Error.cpp" />
+    <ClCompile Include="FastAlloc.cpp" />
+    <ClCompile Include="Hash3.c" />
+    <ClCompile Include="IndexedSet.cpp" />
+    <ClCompile Include="SystemMonitor.cpp" />
+    <ClCompile Include="ThreadPrimitives.cpp" />
+    <ClCompile Include="Platform.cpp" />
+    <ClCompile Include="Trace.cpp" />
+    <ClCompile Include="Knobs.cpp" />
+    <ClCompile Include="TDMetric.cpp" />
+    <ClCompile Include="UnitTest.cpp" />
+    <ClCompile Include="Deque.cpp" />
+    <ClCompile Include="flow.cpp" />
+    <ClCompile Include="FaultInjection.cpp" />
+    <ClCompile Include="IThreadPool.cpp" />
+    <ClCompile Include="network.cpp" />
+    <ClCompile Include="Net2Packet.cpp" />
+    <ClCompile Include="ThreadHelper.cpp" />
+    <ClCompile Include="version.cpp" />
+    <ClCompile Include="stacktrace.amalgamation.cpp" />
+    <ClCompile Include="SignalSafeUnwind.cpp" />
+    <ClCompile Include="XmlTraceLogFormatter.cpp" />
+    <ClCompile Include="FileTraceLogWriter.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="ActorCollection.h" />
+    <ClInclude Include="actorcompiler.h" />
+    <ClInclude Include="Arena.h" />
+    <ClInclude Include="DeterministicRandom.h" />
+    <ClInclude Include="Error.h" />
+    <ClInclude Include="error_definitions.h" />
+    <ClInclude Include="FastAlloc.h" />
+    <ClInclude Include="FastRef.h" />
+    <ClInclude Include="Hash3.h" />
+    <ClInclude Include="IndexedSet.h" />
+    <ClInclude Include="IRandom.h" />
+    <ClInclude Include="IThreadPool.h" />
+    <ClInclude Include="serialize.h" />
+    <ClInclude Include="SimpleOpt.h" />
+    <ClInclude Include="SystemMonitor.h" />
+    <ClInclude Include="ThreadPrimitives.h" />
+    <ClInclude Include="Platform.h" />
+    <ClInclude Include="Trace.h" />
+    <ClInclude Include="ThreadSafeQueue.h" />
+    <ClInclude Include="Knobs.h" />
+    <ClInclude Include="UnitTest.h" />
+    <ClInclude Include="Stats.h" />
+    <ClInclude Include="Deque.h" />
+    <ClInclude Include="IDispatched.h" />
+    <ClInclude Include="flow.h" />
+    <ClInclude Include="FaultInjection.h" />
+    <ClInclude Include="network.h" />
+    <ClInclude Include="AsioReactor.h" />
+    <ClInclude Include="Net2Packet.h" />
+    <ClInclude Include="Profiler.h" />
+    <ClInclude Include="CompressedInt.h" />
+    <ClInclude Include="SignalSafeUnwind.h" />
+    <ClInclude Include="MetricSample.h" />
+    <ClInclude Include="stacktrace.h" />
+    <ClInclude Include="XmlTraceLogFormatter.h" />
+    <ClInclude Include="FileTraceLogWriter.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="no_intellisense.opt" />
+  </ItemGroup>
+</Project>