diff --git a/mappings/dependencies.json b/mappings/dependencies.json
index 4fd99c4e9..6d895480d 100644
--- a/mappings/dependencies.json
+++ b/mappings/dependencies.json
@@ -1110,6 +1110,10 @@
       "id": "Xamarin.AndroidX.MultiDex",
       "dependencies": []
     },
+    {
+      "id": "Xamarin.AndroidX.Migration.Tool",
+      "dependencies": []
+    },
     {
       "id": "Xamarin.AndroidX.Navigation.Common",
       "dependencies": [
diff --git a/source/AndroidXProject.cshtml b/source/AndroidXProject.cshtml
index 4fa5cc994..b4236ac05 100644
--- a/source/AndroidXProject.cshtml
+++ b/source/AndroidXProject.cshtml
@@ -74,13 +74,17 @@
   <ItemGroup>
     @foreach (var art in @Model.MavenArtifacts)
     {
+      if (@Model.NuGetPackageId == "Xamarin.AndroidX.DataBinding.DataBindingCommon" )
+      {
+        continue;
+      }
     <JavaSourceJar
           Include="..\..\externals\@(art.MavenGroupId)\@(art.MavenArtifactId)-sources.jar"
-          Condition="Exists('..\..\..\externals\@(art.MavenGroupId)\@(art.MavenArtifactId)-sources.jar')"
+          Condition="Exists('..\..\externals\@(art.MavenGroupId)\@(art.MavenArtifactId)-sources.jar')"
           />
     <JavaDocJar
           Include="..\..\externals\@(art.MavenGroupId)\@(art.MavenArtifactId)-javadoc.jar"
-          Condition="Exists('..\..\..\externals\@(art.MavenGroupId)\@(art.MavenArtifactId)-javadoc.jar')"
+          Condition="Exists('..\..\externals\@(art.MavenGroupId)\@(art.MavenArtifactId)-javadoc.jar')"
           />
     }
   </ItemGroup>
diff --git a/source/androidx.appcompat/appcompat/Transforms/Metadata.xml b/source/androidx.appcompat/appcompat/Transforms/Metadata.xml
index 5953de091..50ec33149 100644
--- a/source/androidx.appcompat/appcompat/Transforms/Metadata.xml
+++ b/source/androidx.appcompat/appcompat/Transforms/Metadata.xml
@@ -223,4 +223,9 @@
     <attr path="/api/package[@name='androidx.appcompat.graphics.drawable']/class[@name='AnimatedStateListDrawableCompat']/method[@name='getChangingConfigurations' and count(parameter)=0]" name="managedReturn">Android.Content.PM.ConfigChanges</attr>
     <attr path="/api/package[@name='androidx.appcompat.widget']/class[@name='ActivityChooserModel.ActivityResolveInfo']/method[@name='compareTo' and count(parameter)=1 and parameter[1][@type='androidx.appcompat.widget.ActivityChooserModel.ActivityResolveInfo']]/parameter[1]" name="managedType">Java.Lang.Object</attr>
 
+
+    <remove-node
+        path="/api/package[@name='androidx.appcompat.widget']/class[@name='ActionBarContextView']/method[@name='setVisibility' and count(parameter)=1 and parameter[1][@type='int']]"
+        />
+
 </metadata>
\ No newline at end of file