diff --git a/equinox-shipping/Domain.Tests/Domain.Tests.fsproj b/equinox-shipping/Domain.Tests/Domain.Tests.fsproj
index f648e8a71..e486833ba 100644
--- a/equinox-shipping/Domain.Tests/Domain.Tests.fsproj
+++ b/equinox-shipping/Domain.Tests/Domain.Tests.fsproj
@@ -20,10 +20,10 @@
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
 
         <PackageReference Include="Equinox.MemoryStore" Version="2.1.0" />
-        <PackageReference Include="Unquote" Version="5.0.0" />
         <PackageReference Include="FsCheck.Xunit" Version="2.14.2" />
-        <PackageReference Include="xunit" Version="2.4.0" />
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
+        <PackageReference Include="unquote" Version="5.0.0" />
+        <PackageReference Include="xunit" Version="2.4.1" />
+        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/equinox-shipping/Domain/Domain.fsproj b/equinox-shipping/Domain/Domain.fsproj
index f1318422e..1b925f8d4 100644
--- a/equinox-shipping/Domain/Domain.fsproj
+++ b/equinox-shipping/Domain/Domain.fsproj
@@ -2,6 +2,8 @@
 
     <PropertyGroup>
         <TargetFramework>netstandard2.0</TargetFramework>
+        <WarningLevel>5</WarningLevel>
+        <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/equinox-shipping/Watchdog.Integration/Watchdog.Integration.fsproj b/equinox-shipping/Watchdog.Integration/Watchdog.Integration.fsproj
index a64c41a00..93bbc0ea3 100644
--- a/equinox-shipping/Watchdog.Integration/Watchdog.Integration.fsproj
+++ b/equinox-shipping/Watchdog.Integration/Watchdog.Integration.fsproj
@@ -18,10 +18,10 @@
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
 
         <PackageReference Include="Equinox.MemoryStore" Version="2.1.0" />
-        <PackageReference Include="Unquote" Version="5.0.0" />
         <PackageReference Include="FsCheck.Xunit" Version="2.14.2" />
-        <PackageReference Include="xunit" Version="2.4.0" />
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
+        <PackageReference Include="unquote" Version="5.0.0" />
+        <PackageReference Include="xunit" Version="2.4.1" />
+        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/propulsion-sync/Program.fs b/propulsion-sync/Program.fs
index 290b3599c..93640f4d4 100644
--- a/propulsion-sync/Program.fs
+++ b/propulsion-sync/Program.fs
@@ -395,7 +395,7 @@ module Args =
             match __.Tcp, __.Port with
             | false, None ->   Discovery.GossipDns            __.Host
             | false, Some p -> Discovery.GossipDnsCustomPort (__.Host, p)
-            | true, None ->    Discovery.Uri                 (UriBuilder("tcp", __.Host).Uri)
+            | true, None ->    Discovery.Uri                 (UriBuilder("tcp", __.Host, 1113).Uri)
             | true, Some p ->  Discovery.Uri                 (UriBuilder("tcp", __.Host, p).Uri)
         member __.Tcp =
             a.Contains EsSinkParameters.Tcp
diff --git a/tests/Equinox.Templates.Tests/Equinox.Templates.Tests.fsproj b/tests/Equinox.Templates.Tests/Equinox.Templates.Tests.fsproj
index f75eb8769..b3a8e43dd 100644
--- a/tests/Equinox.Templates.Tests/Equinox.Templates.Tests.fsproj
+++ b/tests/Equinox.Templates.Tests/Equinox.Templates.Tests.fsproj
@@ -13,7 +13,8 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
+
         <PackageReference Include="xunit" Version="2.4.1" />
         <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
             <PrivateAssets>all</PrivateAssets>
diff --git a/tests/Equinox.Templates.Tests/Infrastructure.fs b/tests/Equinox.Templates.Tests/Infrastructure.fs
index e029aafaf..748106024 100644
--- a/tests/Equinox.Templates.Tests/Infrastructure.fs
+++ b/tests/Equinox.Templates.Tests/Infrastructure.fs
@@ -21,7 +21,7 @@ module Process =
         direct p.OutputDataReceived (out.AppendLine >> ignore); direct p.ErrorDataReceived (err.AppendLine >> ignore)
         let _wasFresh = p.Start()
         p.BeginErrorReadLine(); p.BeginOutputReadLine()
-        if not (p.WaitForExit 30_000) then
+        if not (p.WaitForExit 60_000) then
             failwithf "Running %s %s timed out" fileName args
         if p.ExitCode <> 0 then
             failwithf "Process <%s %s> Failed:\nstdout: <%O>\n stderr: <%O>" fileName args out err