diff --git a/dirs.proj b/dirs.proj
index 4939a158bb..03fa51b3c4 100644
--- a/dirs.proj
+++ b/dirs.proj
@@ -8,10 +8,11 @@
     <ProjectReference Remove="src/Markup/Avalonia.Markup.Xaml/PortableXaml/**/*.*proj" />
     <ProjectReference Remove="src/Markup/Avalonia.Markup.Xaml/XamlIl/**/*.*proj" />
   </ItemGroup>
-<!-- Disabled on CI because of ancient MSBuild project format -->
-  <ItemGroup>
+  <ItemGroup Condition="!Exists('$(MSBuildExtensionsPath)\Xamarin\Android')">
     <ProjectReference Remove="src/Android/**/*.*proj" />
     <ProjectReference Remove="samples/ControlCatalog.Android/ControlCatalog.Android.csproj" />
+  </ItemGroup>
+  <ItemGroup Condition="!Exists('$(MSBuildExtensionsPath)\Xamarin\iOS')">
     <ProjectReference Remove="src/iOS/**/*.*proj" />
     <ProjectReference Remove="samples/ControlCatalog.iOS/ControlCatalog.iOS.csproj" />
   </ItemGroup>
diff --git a/src/Android/Avalonia.Android/Platform/Specific/Helpers/AndroidTouchEventsHelper.cs b/src/Android/Avalonia.Android/Platform/Specific/Helpers/AndroidTouchEventsHelper.cs
index 112925ab0f..463d499aad 100644
--- a/src/Android/Avalonia.Android/Platform/Specific/Helpers/AndroidTouchEventsHelper.cs
+++ b/src/Android/Avalonia.Android/Platform/Specific/Helpers/AndroidTouchEventsHelper.cs
@@ -33,7 +33,7 @@ namespace Avalonia.Android.Platform.Specific.Helpers
                 return null;
             }
 
-            RawMouseEventType? mouseEventType = null;
+            RawPointerEventType? mouseEventType = null;
             var eventTime = DateTime.Now;
             //Basic touch support
             switch (e.Action)
@@ -42,17 +42,17 @@ namespace Avalonia.Android.Platform.Specific.Helpers
                     //may be bot flood the evnt system with too many event especially on not so powerfull mobile devices
                     if ((eventTime - _lastTouchMoveEventTime).TotalMilliseconds > 10)
                     {
-                        mouseEventType = RawMouseEventType.Move;
+                        mouseEventType = RawPointerEventType.Move;
                     }
                     break;
 
                 case MotionEventActions.Down:
-                    mouseEventType = RawMouseEventType.LeftButtonDown;
+                    mouseEventType = RawPointerEventType.LeftButtonDown;
 
                     break;
 
                 case MotionEventActions.Up:
-                    mouseEventType = RawMouseEventType.LeftButtonUp;
+                    mouseEventType = RawPointerEventType.LeftButtonUp;
                     break;
             }
 
@@ -75,14 +75,14 @@ namespace Avalonia.Android.Platform.Specific.Helpers
                     //we need to generate mouse move before first mouse down event
                     //as this is the way buttons are working every time
                     //otherwise there is a problem sometimes
-                    if (mouseEventType == RawMouseEventType.LeftButtonDown)
+                    if (mouseEventType == RawPointerEventType.LeftButtonDown)
                     {
-                        var me = new RawMouseEventArgs(mouseDevice, (uint)eventTime.Ticks, inputRoot,
-                                    RawMouseEventType.Move, _point, InputModifiers.None);
+                        var me = new RawPointerEventArgs(mouseDevice, (uint)eventTime.Ticks, inputRoot,
+                                    RawPointerEventType.Move, _point, InputModifiers.None);
                         _view.Input(me);
                     }
 
-                    var mouseEvent = new RawMouseEventArgs(mouseDevice, (uint)eventTime.Ticks, inputRoot,
+                    var mouseEvent = new RawPointerEventArgs(mouseDevice, (uint)eventTime.Ticks, inputRoot,
                         mouseEventType.Value, _point, InputModifiers.LeftMouseButton);
                     _view.Input(mouseEvent);
 
diff --git a/src/iOS/Avalonia.iOS/Avalonia.iOS.csproj b/src/iOS/Avalonia.iOS/Avalonia.iOS.csproj
index 683c256b7b..e57fcc643f 100644
--- a/src/iOS/Avalonia.iOS/Avalonia.iOS.csproj
+++ b/src/iOS/Avalonia.iOS/Avalonia.iOS.csproj
@@ -6,6 +6,7 @@
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\packages\Avalonia\Avalonia.csproj" />
+    <PackageReference Include="System.Reflection.Emit" Version="4.3.0" ExcludeAssets="All" />
   </ItemGroup>
   <Import Project="..\..\Shared\PlatformSupport\PlatformSupport.projitems" Label="Shared" />
   <Import Project="..\..\..\build\Rx.props" />
diff --git a/src/iOS/Avalonia.iOS/TopLevelImpl.cs b/src/iOS/Avalonia.iOS/TopLevelImpl.cs
index 83d10b8b44..15e8b35056 100644
--- a/src/iOS/Avalonia.iOS/TopLevelImpl.cs
+++ b/src/iOS/Avalonia.iOS/TopLevelImpl.cs
@@ -86,11 +86,11 @@ namespace Avalonia.iOS
             {
                 var location = touch.LocationInView(this).ToAvalonia();
 
-                Input?.Invoke(new RawMouseEventArgs(
+                Input?.Invoke(new RawPointerEventArgs(
                     iOSPlatform.MouseDevice,
                     (uint)touch.Timestamp,
                     _inputRoot,
-                    RawMouseEventType.LeftButtonUp,
+                    RawPointerEventType.LeftButtonUp,
                     location,
                     InputModifiers.None));
             }
@@ -104,11 +104,11 @@ namespace Avalonia.iOS
             {
                 var location = touch.LocationInView(this).ToAvalonia();
                 _touchLastPoint = location;
-                Input?.Invoke(new RawMouseEventArgs(iOSPlatform.MouseDevice, (uint)touch.Timestamp, _inputRoot,
-                    RawMouseEventType.Move, location, InputModifiers.None));
+                Input?.Invoke(new RawPointerEventArgs(iOSPlatform.MouseDevice, (uint)touch.Timestamp, _inputRoot,
+                    RawPointerEventType.Move, location, InputModifiers.None));
 
-                Input?.Invoke(new RawMouseEventArgs(iOSPlatform.MouseDevice, (uint)touch.Timestamp, _inputRoot,
-                    RawMouseEventType.LeftButtonDown, location, InputModifiers.None));
+                Input?.Invoke(new RawPointerEventArgs(iOSPlatform.MouseDevice, (uint)touch.Timestamp, _inputRoot,
+                    RawPointerEventType.LeftButtonDown, location, InputModifiers.None));
             }
         }
 
@@ -119,8 +119,8 @@ namespace Avalonia.iOS
             {
                 var location = touch.LocationInView(this).ToAvalonia();
                 if (iOSPlatform.MouseDevice.Captured != null)
-                    Input?.Invoke(new RawMouseEventArgs(iOSPlatform.MouseDevice, (uint)touch.Timestamp, _inputRoot,
-                        RawMouseEventType.Move, location, InputModifiers.LeftMouseButton));
+                    Input?.Invoke(new RawPointerEventArgs(iOSPlatform.MouseDevice, (uint)touch.Timestamp, _inputRoot,
+                        RawPointerEventType.Move, location, InputModifiers.LeftMouseButton));
                 else
                 {
                     //magic number based on test - correction of 0.02 is working perfect