diff --git a/Demos/zMachine/Frotz.Net/source/Desktop/FrotzBase/FrotzNetDLL.csproj b/Demos/zMachine/Frotz.Net/source/Desktop/FrotzBase/FrotzNetDLL.csproj
index 891228576..56feeed40 100644
--- a/Demos/zMachine/Frotz.Net/source/Desktop/FrotzBase/FrotzNetDLL.csproj
+++ b/Demos/zMachine/Frotz.Net/source/Desktop/FrotzBase/FrotzNetDLL.csproj
@@ -35,6 +35,24 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x86\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
+    <OutputPath>bin\x86\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Core" />
diff --git a/Demos/zMachine/Frotz.Net/source/FrotzKernel/FrotzKernel/FrotzKernel/FrotzKernel.csproj b/Demos/zMachine/Frotz.Net/source/FrotzKernel/FrotzKernel/FrotzKernel/FrotzKernel.csproj
index 4299c2f07..368ad1f63 100644
--- a/Demos/zMachine/Frotz.Net/source/FrotzKernel/FrotzKernel/FrotzKernel/FrotzKernel.csproj
+++ b/Demos/zMachine/Frotz.Net/source/FrotzKernel/FrotzKernel/FrotzKernel/FrotzKernel.csproj
@@ -50,6 +50,10 @@
       <Project>{3def0461-08ab-471a-8f03-a9c556652a0f}</Project>
       <Name>Cosmos.System</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\Desktop\FrotzBase\FrotzNetDLL.csproj">
+      <Project>{a843c6b0-cff3-4a69-87bc-c93608235e47}</Project>
+      <Name>FrotzNetDLL</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\zConsole\zConsole.csproj">
       <Project>{3e4a8079-aac0-429d-b042-0b5151e0e5be}</Project>
       <Name>zConsole</Name>
diff --git a/Demos/zMachine/Frotz.Net/source/zConsole/zConsole.csproj b/Demos/zMachine/Frotz.Net/source/zConsole/zConsole.csproj
index 86b1a160f..8f564153e 100644
--- a/Demos/zMachine/Frotz.Net/source/zConsole/zConsole.csproj
+++ b/Demos/zMachine/Frotz.Net/source/zConsole/zConsole.csproj
@@ -32,6 +32,26 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x86\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
+    <OutputPath>bin\x86\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Core" />
diff --git a/Tests/Cosmos.Compiler.Tests.Encryption/Cosmos.Compiler.Tests.EncryptionBoot.Cosmos b/Tests/Cosmos.Compiler.Tests.Encryption/Cosmos.Compiler.Tests.EncryptionBoot.Cosmos
index 3ea7d809f..a17a2a7fd 100644
--- a/Tests/Cosmos.Compiler.Tests.Encryption/Cosmos.Compiler.Tests.EncryptionBoot.Cosmos
+++ b/Tests/Cosmos.Compiler.Tests.Encryption/Cosmos.Compiler.Tests.EncryptionBoot.Cosmos
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -26,15 +26,16 @@
     <VisualStudioDebugPort>Pipe: Cosmos\Serial</VisualStudioDebugPort>
   </PropertyGroup>
   <ItemGroup>
-    <ProjectReference Include=".\Cosmos.Compiler.Tests.Encryption.">
-      <Name>Cosmos.Compiler.Tests.Encryption</Name>
-      <Project>{48ebdeb2-6a6a-4df2-b5f1-db6d299401f2}</Project>
-    </ProjectReference>
+    <Reference Include="Cosmos.Core.Plugs, Version=1.0.0.0, Culture=neutral, PublicKeyToken=5ae71220097cb983" />
+    <Reference Include="Cosmos.System.Plugs, Version=1.0.0.0, Culture=neutral, PublicKeyToken=5ae71220097cb983" />
+    <Reference Include="Cosmos.Debug.Kernel.Plugs, Version=1.0.0.0, Culture=neutral, PublicKeyToken=5ae71220097cb983" />
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="Cosmos.Core.Plugs, Version=1.0.0.0, Culture=neutral, PublicKeyToken=5ae71220097cb983"/>
-    <Reference Include="Cosmos.System.Plugs, Version=1.0.0.0, Culture=neutral, PublicKeyToken=5ae71220097cb983"/>
-    <Reference Include="Cosmos.Debug.Kernel.Plugs, Version=1.0.0.0, Culture=neutral, PublicKeyToken=5ae71220097cb983"/>
+    <ProjectReference Include="..\Cosmos.Compiler.Tests.Encryption\Cosmos.Compiler.Tests.Encryption.csproj">
+      <Name>Cosmos.Compiler.Tests.Encryption</Name>
+      <Project>{48ebdeb2-6a6a-4df2-b5f1-db6d299401f2}</Project>
+      <Private>True</Private>
+    </ProjectReference>
   </ItemGroup>
   <!--<ItemGroup>
     <Content Include="Cosmos.bxrc">
@@ -42,4 +43,4 @@
     </Content>
   </ItemGroup>-->
   <Import Project="$(MSBuildExtensionsPath)\Cosmos\Cosmos.targets" />
-</Project>
+</Project>
\ No newline at end of file
diff --git a/Tests/Cosmos.TestRunner.Core/Engine.Running.cs b/Tests/Cosmos.TestRunner.Core/Engine.Running.cs
index 878fd6393..94c49814f 100644
--- a/Tests/Cosmos.TestRunner.Core/Engine.Running.cs
+++ b/Tests/Cosmos.TestRunner.Core/Engine.Running.cs
@@ -55,9 +55,7 @@ namespace Cosmos.TestRunner.Core
             debugConnector.CmdNullReferenceOccurred = a =>
                 {
                     OutputHandler.LogMessage("Null Reference Exception occurred at: 0x" + a.ToString("X8"));
-                    OutputHandler.SetKernelTestResult(
-                        false,
-                        "Null Reference Exception occurred at: 0x" + a.ToString("X8"));
+                    OutputHandler.SetKernelTestResult(false, "Null Reference Exception occurred at: 0x" + a.ToString("X8"));
                     mKernelResultSet = true;
                     mKernelRunning = false;
                 };
@@ -100,7 +98,7 @@ namespace Cosmos.TestRunner.Core
                         break;
                     }
                 }
-                if (!mKernelResultSet)
+                if (mKernelResultSet)
                 {
                     OutputHandler.SetKernelTestResult(true, null);
                 }
diff --git a/source/Cosmos.sln b/source/Cosmos.sln
index 393cc1912..2a2132249 100644
--- a/source/Cosmos.sln
+++ b/source/Cosmos.sln
@@ -1467,8 +1467,8 @@ Global
 		{901EA2C4-5E9C-44E8-B6D2-3B23DEE6D61B}.Debug|Mixed Platforms.Build.0 = Debug|x86
 		{901EA2C4-5E9C-44E8-B6D2-3B23DEE6D61B}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{901EA2C4-5E9C-44E8-B6D2-3B23DEE6D61B}.Debug|x64.Build.0 = Debug|Any CPU
-		{901EA2C4-5E9C-44E8-B6D2-3B23DEE6D61B}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{901EA2C4-5E9C-44E8-B6D2-3B23DEE6D61B}.Debug|x86.Build.0 = Debug|Any CPU
+		{901EA2C4-5E9C-44E8-B6D2-3B23DEE6D61B}.Debug|x86.ActiveCfg = Debug|x86
+		{901EA2C4-5E9C-44E8-B6D2-3B23DEE6D61B}.Debug|x86.Build.0 = Debug|x86
 		{901EA2C4-5E9C-44E8-B6D2-3B23DEE6D61B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{901EA2C4-5E9C-44E8-B6D2-3B23DEE6D61B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{901EA2C4-5E9C-44E8-B6D2-3B23DEE6D61B}.Release|Mixed Platforms.ActiveCfg = Release|x86
@@ -1483,8 +1483,8 @@ Global
 		{84BFA6F0-D518-4D22-BDCF-E07DF3C0E678}.Debug|Mixed Platforms.Build.0 = Debug|x86
 		{84BFA6F0-D518-4D22-BDCF-E07DF3C0E678}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{84BFA6F0-D518-4D22-BDCF-E07DF3C0E678}.Debug|x64.Build.0 = Debug|Any CPU
-		{84BFA6F0-D518-4D22-BDCF-E07DF3C0E678}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{84BFA6F0-D518-4D22-BDCF-E07DF3C0E678}.Debug|x86.Build.0 = Debug|Any CPU
+		{84BFA6F0-D518-4D22-BDCF-E07DF3C0E678}.Debug|x86.ActiveCfg = Debug|x86
+		{84BFA6F0-D518-4D22-BDCF-E07DF3C0E678}.Debug|x86.Build.0 = Debug|x86
 		{84BFA6F0-D518-4D22-BDCF-E07DF3C0E678}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{84BFA6F0-D518-4D22-BDCF-E07DF3C0E678}.Release|Any CPU.Build.0 = Release|Any CPU
 		{84BFA6F0-D518-4D22-BDCF-E07DF3C0E678}.Release|Mixed Platforms.ActiveCfg = Release|x86
@@ -1525,8 +1525,8 @@ Global
 		{A843C6B0-CFF3-4A69-87BC-C93608235E47}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
 		{A843C6B0-CFF3-4A69-87BC-C93608235E47}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{A843C6B0-CFF3-4A69-87BC-C93608235E47}.Debug|x64.Build.0 = Debug|Any CPU
-		{A843C6B0-CFF3-4A69-87BC-C93608235E47}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{A843C6B0-CFF3-4A69-87BC-C93608235E47}.Debug|x86.Build.0 = Debug|Any CPU
+		{A843C6B0-CFF3-4A69-87BC-C93608235E47}.Debug|x86.ActiveCfg = Debug|x86
+		{A843C6B0-CFF3-4A69-87BC-C93608235E47}.Debug|x86.Build.0 = Debug|x86
 		{A843C6B0-CFF3-4A69-87BC-C93608235E47}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A843C6B0-CFF3-4A69-87BC-C93608235E47}.Release|Any CPU.Build.0 = Release|Any CPU
 		{A843C6B0-CFF3-4A69-87BC-C93608235E47}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
@@ -1540,8 +1540,8 @@ Global
 		{3E4A8079-AAC0-429D-B042-0B5151E0E5BE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
 		{3E4A8079-AAC0-429D-B042-0B5151E0E5BE}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{3E4A8079-AAC0-429D-B042-0B5151E0E5BE}.Debug|x64.Build.0 = Debug|Any CPU
-		{3E4A8079-AAC0-429D-B042-0B5151E0E5BE}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{3E4A8079-AAC0-429D-B042-0B5151E0E5BE}.Debug|x86.Build.0 = Debug|Any CPU
+		{3E4A8079-AAC0-429D-B042-0B5151E0E5BE}.Debug|x86.ActiveCfg = Debug|x86
+		{3E4A8079-AAC0-429D-B042-0B5151E0E5BE}.Debug|x86.Build.0 = Debug|x86
 		{3E4A8079-AAC0-429D-B042-0B5151E0E5BE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3E4A8079-AAC0-429D-B042-0B5151E0E5BE}.Release|Any CPU.Build.0 = Release|Any CPU
 		{3E4A8079-AAC0-429D-B042-0B5151E0E5BE}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU