diff --git a/.gitignore b/.gitignore
index b149e8e43..8742bf01b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,9 +9,10 @@
 
 # Build results
 
-[Oo]bj/
+[Aa]rtifacts
 [Bb]in
 [Pp]ackages/
+[Oo]bj/
 
 *.[Oo]bj
 *.suo
diff --git a/Build/Targets/RepoLayout.props b/Build/Targets/RepoLayout.props
index bed7f6125..0e587bb6c 100644
--- a/Build/Targets/RepoLayout.props
+++ b/Build/Targets/RepoLayout.props
@@ -2,8 +2,8 @@
 
     <PropertyGroup>
         <ArtifactsDir Condition="'$(ArtifactsDir)' == ''">$(RepoRoot)artifacts\$(Configuration)\</ArtifactsDir>
-		<DefaultPackageOutputPath>$(ArtifactsDir)nupkg\</DefaultPackageOutputPath>
-        <!--<PackageOutputPath>$(DefaultPackageOutputPath)</PackageOutputPath>-->
+        <DefaultPackageOutputPath>$(ArtifactsDir)nupkg\</DefaultPackageOutputPath>
+        <PackageOutputPath>$(DefaultPackageOutputPath)</PackageOutputPath>
         <VsixOutputPath>$(ArtifactsDir)VSIX\</VsixOutputPath>
     </PropertyGroup>
 
diff --git a/Build/Targets/VSIX.targets b/Build/Targets/VSIX.targets
index 86fa9e12b..35b021b60 100644
--- a/Build/Targets/VSIX.targets
+++ b/Build/Targets/VSIX.targets
@@ -4,13 +4,11 @@
         <UseCodebase>True</UseCodebase>
     </PropertyGroup>
 
-    <!--
     <PropertyGroup>
         <_TargetVsixContainerDir>$(VsixOutputPath)</_TargetVsixContainerDir>
         <TargetVsixContainerName Condition="'$(TargetVsixContainerName)' == ''">$(TargetName).vsix</TargetVsixContainerName>
         <TargetVsixContainer Condition="'$(TargetVsixContainer)' == ''">$(_TargetVsixContainerDir)$(TargetVsixContainerName)</TargetVsixContainer>
     </PropertyGroup>
-    -->
 
     <ItemGroup>
         <PackageReference Include="Microsoft.VSSDK.BuildTools" PrivateAssets="All" />
diff --git a/source/Cosmos.Build.Builder/BuildTasks/BuildTask.cs b/source/Cosmos.Build.Builder/BuildTasks/BuildTask.cs
index e8019d6de..249d44d03 100644
--- a/source/Cosmos.Build.Builder/BuildTasks/BuildTask.cs
+++ b/source/Cosmos.Build.Builder/BuildTasks/BuildTask.cs
@@ -22,13 +22,15 @@ namespace Cosmos.Build.Builder.BuildTasks
         public BuildTask(
             IMSBuildService msBuildService,
             string projectFilePath,
-            string outputPath)
+            string outputPath,
+            string vsixOutputPath)
             : base(msBuildService)
         {
             ProjectFilePath = projectFilePath;
 
             _properties = new Dictionary<string, string>();
             _properties.Add("OutputPath", outputPath);
+            _properties.Add("VsixOutputPath", vsixOutputPath);
         }
     }
 }
diff --git a/source/Cosmos.Build.Builder/BuildTasks/MSBuildTargetBuildTaskBase.cs b/source/Cosmos.Build.Builder/BuildTasks/MSBuildTargetBuildTaskBase.cs
index 762a85806..926329c63 100644
--- a/source/Cosmos.Build.Builder/BuildTasks/MSBuildTargetBuildTaskBase.cs
+++ b/source/Cosmos.Build.Builder/BuildTasks/MSBuildTargetBuildTaskBase.cs
@@ -35,7 +35,14 @@ namespace Cosmos.Build.Builder.BuildTasks
             {
                 foreach (var property in Properties)
                 {
-                    args += $" /p:\"{property.Key}={property.Value}\"";
+                    var value = property.Value;
+
+                    if (value.EndsWith("\\"))
+                    {
+                        value += '\\';
+                    }
+
+                    args += $" /p:\"{property.Key}={value}\"";
                 }
             }
 
diff --git a/source/Cosmos.Build.Builder/CosmosBuildDefinition.cs b/source/Cosmos.Build.Builder/CosmosBuildDefinition.cs
index 3b5c9bdb6..0d7d7e08f 100644
--- a/source/Cosmos.Build.Builder/CosmosBuildDefinition.cs
+++ b/source/Cosmos.Build.Builder/CosmosBuildDefinition.cs
@@ -70,14 +70,13 @@ namespace Cosmos.Build.Builder
             }
 
             var il2cpuDir = Path.GetFullPath(Path.Combine(_cosmosDir, "..", "IL2CPU"));
-            var xsharpDir = Path.GetFullPath(Path.Combine(_cosmosDir, "..", "XSharp"));
 
             var cosmosSourceDir = Path.Combine(_cosmosDir, "source");
             var il2cpuSourceDir = Path.Combine(il2cpuDir, "source");
 
             var buildSlnPath = Path.Combine(_cosmosDir, "Build.sln");
             
-            var vsipDir = Path.Combine(_cosmosDir, "Build", "VSIP");
+            var vsipDir = Path.Combine(_cosmosDir, "Build", "VSIP") + '\\';
 
             if (Directory.Exists(vsipDir))
             {
@@ -90,7 +89,7 @@ namespace Cosmos.Build.Builder
 
             // Build Build.sln
 
-            yield return new BuildTask(_msBuildService, buildSlnPath, vsipDir);
+            yield return new BuildTask(_msBuildService, buildSlnPath, vsipDir, vsipDir);
 
             // Publish IL2CPU