diff --git a/Test.sln b/Test.sln
index bc9de0166..272a2be00 100644
--- a/Test.sln
+++ b/Test.sln
@@ -46,6 +46,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.Core.Common", "sourc
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.System", "source\Cosmos.System\Cosmos.System.csproj", "{4AC1AFCE-C8CE-484D-AE22-F9EE27008FAF}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{CFE37077-B9BD-4430-8DA0-F9F02DFD14C3}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "XSharp", "XSharp", "{E9CD521E-C386-466D-B5F7-A5EB19A61625}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XSharp.Common", "source\XSharp.Common\XSharp.Common.csproj", "{72EB557A-8A2D-4B0F-823E-C70A791831B5}"
@@ -68,6 +70,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Common", "Common", "{170A7D
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Debug", "Debug", "{65532163-618F-41F2-B39C-6F6022483158}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NASM", "Tools\NASM\NASM.csproj", "{A2E6978B-FE78-433C-8A17-624579B393DF}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IL2CPU", "source\IL2CPU\IL2CPU.csproj", "{295AA95F-BEC6-4F9E-A2E1-8205FD06E951}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Compiler", "Compiler", "{ECEA7778-E786-4317-90B9-A2D4427CB91C}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Kernel", "Kernel", "{29EEC029-6A2B-478A-B6E5-D63A91388ABA}"
@@ -295,6 +301,22 @@ Global
 		{9431FF1F-AD75-4A1E-B38A-46E0F109411D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{9431FF1F-AD75-4A1E-B38A-46E0F109411D}.Release|x86.ActiveCfg = Release|Any CPU
 		{9431FF1F-AD75-4A1E-B38A-46E0F109411D}.Release|x86.Build.0 = Release|Any CPU
+		{A2E6978B-FE78-433C-8A17-624579B393DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A2E6978B-FE78-433C-8A17-624579B393DF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A2E6978B-FE78-433C-8A17-624579B393DF}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A2E6978B-FE78-433C-8A17-624579B393DF}.Debug|x86.Build.0 = Debug|Any CPU
+		{A2E6978B-FE78-433C-8A17-624579B393DF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A2E6978B-FE78-433C-8A17-624579B393DF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A2E6978B-FE78-433C-8A17-624579B393DF}.Release|x86.ActiveCfg = Release|Any CPU
+		{A2E6978B-FE78-433C-8A17-624579B393DF}.Release|x86.Build.0 = Release|Any CPU
+		{295AA95F-BEC6-4F9E-A2E1-8205FD06E951}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{295AA95F-BEC6-4F9E-A2E1-8205FD06E951}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{295AA95F-BEC6-4F9E-A2E1-8205FD06E951}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{295AA95F-BEC6-4F9E-A2E1-8205FD06E951}.Debug|x86.Build.0 = Debug|Any CPU
+		{295AA95F-BEC6-4F9E-A2E1-8205FD06E951}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{295AA95F-BEC6-4F9E-A2E1-8205FD06E951}.Release|Any CPU.Build.0 = Release|Any CPU
+		{295AA95F-BEC6-4F9E-A2E1-8205FD06E951}.Release|x86.ActiveCfg = Release|Any CPU
+		{295AA95F-BEC6-4F9E-A2E1-8205FD06E951}.Release|x86.Build.0 = Release|Any CPU
 		{39D2CC10-CD6B-4BC3-B42C-CA26004D38EB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{39D2CC10-CD6B-4BC3-B42C-CA26004D38EB}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{39D2CC10-CD6B-4BC3-B42C-CA26004D38EB}.Debug|x86.ActiveCfg = Debug|Any CPU
@@ -494,6 +516,8 @@ Global
 		{0259702E-9575-4852-A641-5F9714A9C740} = {9A923E6F-FF63-4F02-A4EA-C2D44F9323FD}
 		{170A7DE2-E899-4E92-A12B-E68876C9B2A5} = {9A923E6F-FF63-4F02-A4EA-C2D44F9323FD}
 		{65532163-618F-41F2-B39C-6F6022483158} = {9A923E6F-FF63-4F02-A4EA-C2D44F9323FD}
+		{A2E6978B-FE78-433C-8A17-624579B393DF} = {CFE37077-B9BD-4430-8DA0-F9F02DFD14C3}
+		{295AA95F-BEC6-4F9E-A2E1-8205FD06E951} = {C286932C-3F6D-47F0-BEEF-26843D1BB11B}
 		{ECEA7778-E786-4317-90B9-A2D4427CB91C} = {1A46752C-98F3-4DE3-B1FB-EDCE22E8AF73}
 		{29EEC029-6A2B-478A-B6E5-D63A91388ABA} = {1A46752C-98F3-4DE3-B1FB-EDCE22E8AF73}
 		{0E67EFE8-5944-4F6C-8B47-C5E06D4C79F5} = {1A46752C-98F3-4DE3-B1FB-EDCE22E8AF73}
diff --git a/Tests/Cosmos.TestRunner/Cosmos.TestRunner.csproj b/Tests/Cosmos.TestRunner/Cosmos.TestRunner.csproj
index fa623f2d3..cfc09c67f 100644
--- a/Tests/Cosmos.TestRunner/Cosmos.TestRunner.csproj
+++ b/Tests/Cosmos.TestRunner/Cosmos.TestRunner.csproj
@@ -10,6 +10,8 @@
     </PropertyGroup>
 
     <ItemGroup>
+        <ProjectReference Include="..\..\source\IL2CPU\IL2CPU.csproj" />
+        <ProjectReference Include="..\..\Tools\NASM\NASM.csproj" />
         <ProjectReference Include="..\Cosmos.TestRunner.Core\Cosmos.TestRunner.Core.csproj" />
     </ItemGroup>
 
diff --git a/Tools/ElfMap2DebugDb/ElfMap2DebugDb.csproj b/Tools/ElfMap2DebugDb/ElfMap2DebugDb.csproj
index a815eae6a..ab19a4047 100644
--- a/Tools/ElfMap2DebugDb/ElfMap2DebugDb.csproj
+++ b/Tools/ElfMap2DebugDb/ElfMap2DebugDb.csproj
@@ -1,19 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <TargetFramework>netstandard1.6</TargetFramework>
-    <SignAssembly>True</SignAssembly>
-    <AssemblyOriginatorKeyFile>..\..\Cosmos.snk</AssemblyOriginatorKeyFile>
-    <OutputType>exe</OutputType>
-  </PropertyGroup>
+    <PropertyGroup>
+        <TargetFramework>netcoreapp1.0</TargetFramework>
+        <RuntimeIdentifier>win7-x86</RuntimeIdentifier>
+        <SignAssembly>True</SignAssembly>
+        <AssemblyOriginatorKeyFile>..\..\Cosmos.snk</AssemblyOriginatorKeyFile>
+        <OutputType>Exe</OutputType>
+    </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NETCore.Runtime.CoreCLR" Version="1.1.1" />
-    <PackageReference Include="Microsoft.NETCore.DotNetHostPolicy" Version="1.1.0" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\source\Cosmos.Debug.Common\Cosmos.Debug.Common.csproj" />
-  </ItemGroup>
+    <ItemGroup>
+        <ProjectReference Include="..\..\source\Cosmos.Debug.Common\Cosmos.Debug.Common.csproj" />
+    </ItemGroup>
 
 </Project>
diff --git a/Tools/NASM/NASM.csproj b/Tools/NASM/NASM.csproj
index 1950903ed..a2bb3fe52 100644
--- a/Tools/NASM/NASM.csproj
+++ b/Tools/NASM/NASM.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <TargetFramework>netcoreapp1.0</TargetFramework>
-        <RuntimeIdentifiers>win7-x86</RuntimeIdentifiers>
+        <RuntimeIdentifier>win7-x86</RuntimeIdentifier>
         <SignAssembly>True</SignAssembly>
         <AssemblyOriginatorKeyFile>..\..\Cosmos.snk</AssemblyOriginatorKeyFile>
         <OutputType>Exe</OutputType>