diff --git a/source/Cosmos.sln b/source/Cosmos.sln
index 93d2858ad..53b1e7969 100644
--- a/source/Cosmos.sln
+++ b/source/Cosmos.sln
@@ -675,7 +675,6 @@ Global
 		{C801F19C-A9D3-42D5-9A57-9FFDF9B4D05E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{C801F19C-A9D3-42D5-9A57-9FFDF9B4D05E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C801F19C-A9D3-42D5-9A57-9FFDF9B4D05E}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
-		{C801F19C-A9D3-42D5-9A57-9FFDF9B4D05E}.Debug|Mixed Platforms.Build.0 = Debug|x86
 		{C801F19C-A9D3-42D5-9A57-9FFDF9B4D05E}.Debug|x86.ActiveCfg = Debug|x86
 		{C801F19C-A9D3-42D5-9A57-9FFDF9B4D05E}.Debug|x86.Build.0 = Debug|x86
 		{C801F19C-A9D3-42D5-9A57-9FFDF9B4D05E}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -1148,6 +1147,7 @@ Global
 		{F708C866-1C9B-4579-8C28-0728ECCFC1ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F708C866-1C9B-4579-8C28-0728ECCFC1ED}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F708C866-1C9B-4579-8C28-0728ECCFC1ED}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{F708C866-1C9B-4579-8C28-0728ECCFC1ED}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
 		{F708C866-1C9B-4579-8C28-0728ECCFC1ED}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{F708C866-1C9B-4579-8C28-0728ECCFC1ED}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F708C866-1C9B-4579-8C28-0728ECCFC1ED}.Release|Any CPU.Build.0 = Release|Any CPU
diff --git a/source2/IL2CPU/Cosmos.IL2CPU.Profiler/Assembler.cs b/source2/IL2CPU/Cosmos.IL2CPU.Profiler/Assembler.cs
index 7016798a7..89c462067 100644
--- a/source2/IL2CPU/Cosmos.IL2CPU.Profiler/Assembler.cs
+++ b/source2/IL2CPU/Cosmos.IL2CPU.Profiler/Assembler.cs
@@ -4,10 +4,13 @@ using System.Linq;
 using System.Text;
 
 namespace Cosmos.IL2CPU.Profiler {
-  public class Assembler : Cosmos.IL2CPU.AppAssembler {
+  public class Assembler : Cosmos.IL2CPU.X86.AppAssembler {
 
+    public Assembler() : base(0) {
+    }
+    
     protected override void InitILOps() {
-      var xILOp = new ILOp(this);
+      var xILOp = new ILOp(this.Assembler);
       // Don't change the type in the foreach to a var, its necessary as it is now
       // to typecast it, so we can then recast to an int.
       foreach (ILOpCode.Code xCode in Enum.GetValues(typeof(ILOpCode.Code))) {
diff --git a/source2/IL2CPU/Cosmos.IL2CPU.Profiler/Cosmos.IL2CPU.Profiler.csproj b/source2/IL2CPU/Cosmos.IL2CPU.Profiler/Cosmos.IL2CPU.Profiler.csproj
index 74da7ba13..557c56e17 100644
--- a/source2/IL2CPU/Cosmos.IL2CPU.Profiler/Cosmos.IL2CPU.Profiler.csproj
+++ b/source2/IL2CPU/Cosmos.IL2CPU.Profiler/Cosmos.IL2CPU.Profiler.csproj
@@ -64,6 +64,10 @@
       <Project>{6110AD07-EB07-4A99-BB73-7A69AF5732F1}</Project>
       <Name>Cosmos.Sys.Plugs</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\Cosmos.Assembler.X86\Cosmos.Assembler.x86.csproj">
+      <Project>{94D079E4-3C66-486A-8407-EA6EC049FF53}</Project>
+      <Name>Cosmos.Assembler.x86</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\Cosmos.Assembler\Cosmos.Assembler.csproj">
       <Project>{1116130E-28E0-428A-A597-F4B3B676C0CA}</Project>
       <Name>Cosmos.Assembler</Name>