diff --git a/build-tools/xa-prep-tasks/Xamarin.Android.BuildTools.PrepTasks/SystemUnzip.cs b/build-tools/xa-prep-tasks/Xamarin.Android.BuildTools.PrepTasks/SystemUnzip.cs
index dd70d2c9d18..e9b555deb50 100644
--- a/build-tools/xa-prep-tasks/Xamarin.Android.BuildTools.PrepTasks/SystemUnzip.cs
+++ b/build-tools/xa-prep-tasks/Xamarin.Android.BuildTools.PrepTasks/SystemUnzip.cs
@@ -108,7 +108,7 @@ async TTask ExtractFile (string tempDir, string sourceFile, string relativeDestD
 				p.WaitForExit ();
 			}
 
-			var entries = GetExtractedSourceEntries (nestedTemp);
+			var entries = GetExtractedSourceDirectories (nestedTemp);
 
 			var seenDestFiles   = new HashSet<string> ();
 
@@ -164,12 +164,12 @@ async TTask ExtractFile (string tempDir, string sourceFile, string relativeDestD
 			}
 		}
 
-		IEnumerable<string> GetExtractedSourceEntries (string root)
+		IEnumerable<string> GetExtractedSourceDirectories (string root)
 		{
-			var entries = Directory.EnumerateFileSystemEntries (root, SourceEntryGlobParts [0], SearchOption.TopDirectoryOnly);
+			var entries = Directory.EnumerateDirectories (root, SourceEntryGlobParts [0], SearchOption.TopDirectoryOnly);
 			for (int i = 1; i < SourceEntryGlobParts.Length; ++i) {
 				entries = entries
-					.SelectMany (e => Directory.EnumerateFileSystemEntries (e, SourceEntryGlobParts [i], SearchOption.TopDirectoryOnly));
+					.SelectMany (e => Directory.EnumerateDirectories (e, SourceEntryGlobParts [i], SearchOption.TopDirectoryOnly));
 			}
 			return entries;
 		}
diff --git a/tests/Xamarin.Android.Bcl-Tests/Xamarin.Android.Bcl-Tests.csproj b/tests/Xamarin.Android.Bcl-Tests/Xamarin.Android.Bcl-Tests.csproj
index ca490a650f1..8b67e115701 100644
--- a/tests/Xamarin.Android.Bcl-Tests/Xamarin.Android.Bcl-Tests.csproj
+++ b/tests/Xamarin.Android.Bcl-Tests/Xamarin.Android.Bcl-Tests.csproj
@@ -62,7 +62,7 @@
     <Compile Include="Resources\Resource.designer.cs" />
     <Compile Include="System.Net\NetworkChangeTest.cs" />
     <Compile Include="System.Net.Http\HttpClientTest.cs" />
-    <Compile Include="$(IntermediateOutputPath)\App.cs" Condition=" Exists('$(IntermediateOutputPath)\App.cs') "/>
+    <Compile Include="$(IntermediateOutputPath)\App.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="Resources\AboutResources.txt" />
diff --git a/tests/Xamarin.Android.Bcl-Tests/Xamarin.Android.Bcl-Tests.targets b/tests/Xamarin.Android.Bcl-Tests/Xamarin.Android.Bcl-Tests.targets
index fef7a1fe9a7..63ff214601e 100644
--- a/tests/Xamarin.Android.Bcl-Tests/Xamarin.Android.Bcl-Tests.targets
+++ b/tests/Xamarin.Android.Bcl-Tests/Xamarin.Android.Bcl-Tests.targets
@@ -67,9 +67,6 @@
       Inputs="@(MonoTestAssembly->'..\..\bin\$(Configuration)\bcl-tests\%(Identity)')"
       Outputs="$(IntermediateOutputPath)\App.cs">
     <MakeDir Directories="$(IntermediateOutputPath)" />
-    <ItemGroup>
-      <Compile Include="$(IntermediateOutputPath)\App.cs" />
-    </ItemGroup>
     <PropertyGroup>
       <_Assemblies>@(MonoTestAssembly->'"%(Identity)"', ',  ')</_Assemblies>
     </PropertyGroup>