diff --git a/src/impl/installation/NServiceBus.Installation.Windows/DtcInstaller.cs b/src/impl/installation/NServiceBus.Installation.Windows/DtcInstaller.cs
index 2b86cf9b1bc..3deb0329607 100644
--- a/src/impl/installation/NServiceBus.Installation.Windows/DtcInstaller.cs
+++ b/src/impl/installation/NServiceBus.Installation.Windows/DtcInstaller.cs
@@ -1,10 +1,11 @@
 using System;
+using System.Security.Principal;
 
 namespace NServiceBus.Installation.Windows
 {
     class DtcInstaller : INeedToInstallInfrastructure<Environments.Windows>
     {
-        public void Install()
+        public void Install(WindowsIdentity identity)
         {
             Utils.DtcUtil.StartDtcIfNecessary();
         }
diff --git a/src/impl/installation/NServiceBus.Installation.Windows/MsmqInstaller.cs b/src/impl/installation/NServiceBus.Installation.Windows/MsmqInstaller.cs
index fd0ba0153ba..28e20417d68 100644
--- a/src/impl/installation/NServiceBus.Installation.Windows/MsmqInstaller.cs
+++ b/src/impl/installation/NServiceBus.Installation.Windows/MsmqInstaller.cs
@@ -1,10 +1,11 @@
 using System;
+using System.Security.Principal;
 
 namespace NServiceBus.Installation.Windows
 {
     class MsmqInstaller : INeedToInstallInfrastructure<Environments.Windows>
     {
-        public void Install()
+        public void Install(WindowsIdentity identity)
         {
             Utils.MsmqInstallation.StartMsmqIfNecessary();
         }
diff --git a/src/impl/unicast/NServiceBus.Unicast.Subscriptions.Msmq/NServiceBus.Unicast.Subscriptions.Msmq.Config/NServiceBus.Unicast.Subscriptions.Msmq.Config.csproj b/src/impl/unicast/NServiceBus.Unicast.Subscriptions.Msmq/NServiceBus.Unicast.Subscriptions.Msmq.Config/NServiceBus.Unicast.Subscriptions.Msmq.Config.csproj
index 65c58854b0a..8b1179158fc 100644
--- a/src/impl/unicast/NServiceBus.Unicast.Subscriptions.Msmq/NServiceBus.Unicast.Subscriptions.Msmq.Config/NServiceBus.Unicast.Subscriptions.Msmq.Config.csproj
+++ b/src/impl/unicast/NServiceBus.Unicast.Subscriptions.Msmq/NServiceBus.Unicast.Subscriptions.Msmq.Config/NServiceBus.Unicast.Subscriptions.Msmq.Config.csproj
@@ -59,19 +59,16 @@
       <HintPath>..\..\..\..\..\build\output\NServiceBus.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="NServiceBus.Config, Version=1.9.2.1943, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\build\NServiceBus.Config.dll</HintPath>
+    <Reference Include="NServiceBus.Config">
+      <HintPath>..\..\..\..\..\build\nservicebus.core\NServiceBus.Config.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="NServiceBus.ObjectBuilder, Version=1.9.3.39473, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\build\NServiceBus.ObjectBuilder.dll</HintPath>
+    <Reference Include="NServiceBus.ObjectBuilder">
+      <HintPath>..\..\..\..\..\build\nservicebus.core\NServiceBus.ObjectBuilder.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="NServiceBus.Unicast.Subscriptions, Version=1.9.2.7610, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\build\NServiceBus.Unicast.Subscriptions.dll</HintPath>
+    <Reference Include="NServiceBus.Unicast.Subscriptions">
+      <HintPath>..\..\..\..\..\build\nservicebus.core\NServiceBus.Unicast.Subscriptions.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="System" />
diff --git a/src/impl/unicast/NServiceBus.Unicast.Subscriptions.Msmq/NServiceBus.Unicast.Subscriptions.Msmq.csproj b/src/impl/unicast/NServiceBus.Unicast.Subscriptions.Msmq/NServiceBus.Unicast.Subscriptions.Msmq.csproj
index e41f4e70d49..1bf513052fa 100644
--- a/src/impl/unicast/NServiceBus.Unicast.Subscriptions.Msmq/NServiceBus.Unicast.Subscriptions.Msmq.csproj
+++ b/src/impl/unicast/NServiceBus.Unicast.Subscriptions.Msmq/NServiceBus.Unicast.Subscriptions.Msmq.csproj
@@ -14,7 +14,6 @@
     </FileUpgradeFlags>
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
-    
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
@@ -64,24 +63,21 @@
       <HintPath>..\..\..\..\build\output\NServiceBus.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="NServiceBus.ObjectBuilder, Version=1.9.3.39473, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\build\NServiceBus.ObjectBuilder.dll</HintPath>
+    <Reference Include="NServiceBus.ObjectBuilder">
+      <HintPath>..\..\..\..\build\nservicebus.core\NServiceBus.ObjectBuilder.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="NServiceBus.Unicast.Subscriptions, Version=1.9.0.38057, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\build\NServiceBus.Unicast.Subscriptions.dll</HintPath>
+    <Reference Include="NServiceBus.Unicast.Subscriptions">
+      <HintPath>..\..\..\..\build\nservicebus.core\NServiceBus.Unicast.Subscriptions.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="NServiceBus.Unicast.Transport, Version=1.9.0.38023, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\build\NServiceBus.Unicast.Transport.dll</HintPath>
+    <Reference Include="NServiceBus.Unicast.Transport">
+      <HintPath>..\..\..\..\build\nservicebus.core\NServiceBus.Unicast.Transport.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="NServiceBus.Utils, Version=1.10.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\build\NServiceBus.Utils.dll</HintPath>
+    <Reference Include="NServiceBus.Utils">
+      <HintPath>..\..\..\..\build\nservicebus.core\NServiceBus.Utils.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.configuration" />
diff --git a/src/installation/NServiceBus.Installation/INeedToInstallInfrastructure.cs b/src/installation/NServiceBus.Installation/INeedToInstallInfrastructure.cs
index f3efad20df7..b53e6acf079 100644
--- a/src/installation/NServiceBus.Installation/INeedToInstallInfrastructure.cs
+++ b/src/installation/NServiceBus.Installation/INeedToInstallInfrastructure.cs
@@ -20,7 +20,7 @@ public interface INeedToInstallInfrastructure
     /// Interface invoked by the infrastructure when going to install an endpoint for a specific environment.
     /// </summary>
     /// <typeparam name="T"></typeparam>
-    public interface INeedToInstallInfrastructure<T> where T : IEnvironment
+    public interface INeedToInstallInfrastructure<T> : INeedToInstallInfrastructure where T : IEnvironment
     {
         
     }