diff --git a/Samples/WindowsFormsEditor/WindowsFormsEditor_WindowsMetro.csproj b/Samples/WindowsFormsEditor/WindowsFormsEditor_WindowsMetro.csproj
index 5f1bbcfd..b2cf9dbd 100644
--- a/Samples/WindowsFormsEditor/WindowsFormsEditor_WindowsMetro.csproj
+++ b/Samples/WindowsFormsEditor/WindowsFormsEditor_WindowsMetro.csproj
@@ -40,7 +40,9 @@
     <Reference Include="System.Windows.Forms" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Form1.cs" />
+    <Compile Include="Form1.cs">
+      <SubType>Form</SubType>
+    </Compile>
     <Compile Include="Form1.Designer.cs">
       <DependentUpon>Form1.cs</DependentUpon>
     </Compile>
diff --git a/Samples/WindowsGame/WindowsGame_WindowsMetro.csproj b/Samples/WindowsGame/WindowsGame_WindowsMetro.csproj
index 819f8e2f..c46c0211 100644
--- a/Samples/WindowsGame/WindowsGame_WindowsMetro.csproj
+++ b/Samples/WindowsGame/WindowsGame_WindowsMetro.csproj
@@ -67,7 +67,9 @@
     <Reference Include="System.Net" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="AddInSelector.cs" />
+    <Compile Include="AddInSelector.cs">
+      <SubType>Form</SubType>
+    </Compile>
     <Compile Include="AddInSelector.Designer.cs">
       <DependentUpon>AddInSelector.cs</DependentUpon>
     </Compile>
diff --git a/Tools/ProjectConverter/Platforms/Metro/MetroAssets.cs b/Tools/ProjectConverter/Platforms/Metro/MetroAssets.cs
index 074e5b9e..b9a43048 100644
--- a/Tools/ProjectConverter/Platforms/Metro/MetroAssets.cs
+++ b/Tools/ProjectConverter/Platforms/Metro/MetroAssets.cs
@@ -31,7 +31,7 @@ namespace ProjectConverter.Platforms.Metro
 			}
 			
 			XName contentNodeName = XName.Get("Content", itemGroup.Name.NamespaceName);
-			string anxAssetsPath = "../../media/MetroDefaultAssets";
+			string anxAssetsPath = "../media/MetroDefaultAssets";
 			foreach (string assetFilepath in Directory.GetFiles(anxAssetsPath))
 			{
 				string filename = Path.GetFileName(assetFilepath);
diff --git a/build/ANX.Framework.build b/build/ANX.Framework.build
index 01c72e14..d4b25d5a 100644
--- a/build/ANX.Framework.build
+++ b/build/ANX.Framework.build
@@ -1,4 +1,4 @@
-<project name="ANX.Framework Build" default="build">
+<project name="ANX.Framework Build" default="build" basedir="./">
   <property name="build.platform" value="Any CPU" />
   <property name="build.dir" value="../../bin" />
   <property name="build.dir.tools" value="../bin" />
@@ -650,8 +650,10 @@
       <exclude name="**/*_PSVita.csproj" />
       <exclude name="**/*_WindowsMetro.csproj" />
 
-      <exclude name="Samples/**/*.csproj" if="${project.anx.metro}" />
-    </fileset>
+<!--
+    <exclude name="Samples/**/*.csproj" if="${project.anx.metro}" />
+-->
+  </fileset>
 
     <foreach item="File" property="projectFile">
       <in>