diff --git a/src/Avalonia.Layout/UniformGridLayout.cs b/src/Avalonia.Layout/UniformGridLayout.cs
index ee1d88940c..54c3ccbb90 100644
--- a/src/Avalonia.Layout/UniformGridLayout.cs
+++ b/src/Avalonia.Layout/UniformGridLayout.cs
@@ -490,7 +490,6 @@ namespace Avalonia.Layout
             else if (property == ItemsStretchProperty)
             {
                 _itemsStretch = newValue.GetValueOrDefault<UniformGridLayoutItemsStretch>();
-                ;
             }
             else if (property == MinItemWidthProperty)
             {
@@ -500,9 +499,9 @@ namespace Avalonia.Layout
             {
                 _minItemHeight = newValue.GetValueOrDefault<double>();
             }
-            else if (args.Property == MaximumRowsOrColumnsProperty)
+            else if (property == MaximumRowsOrColumnsProperty)
             {
-                _maximumRowsOrColumns = (int)args.NewValue;
+                _maximumRowsOrColumns = newValue.GetValueOrDefault<int>();
             }
 
             InvalidateLayout();
diff --git a/src/Avalonia.Visuals/Media/DrawingImage.cs b/src/Avalonia.Visuals/Media/DrawingImage.cs
index d6ab004dd7..57939bab24 100644
--- a/src/Avalonia.Visuals/Media/DrawingImage.cs
+++ b/src/Avalonia.Visuals/Media/DrawingImage.cs
@@ -1,4 +1,5 @@
 using System;
+using Avalonia.Data;
 using Avalonia.Metadata;
 using Avalonia.Platform;
 using Avalonia.Visuals.Media.Imaging;
@@ -62,11 +63,15 @@ namespace Avalonia.Media
         }
 
         /// <inheritdoc/>
-        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs e)
+        protected override void OnPropertyChanged<T>(
+            AvaloniaProperty<T> property,
+            Optional<T> oldValue,
+            BindingValue<T> newValue,
+            BindingPriority priority)
         {
-            base.OnPropertyChanged(e);
+            base.OnPropertyChanged(property, oldValue, newValue, priority);
 
-            if (e.Property == DrawingProperty)
+            if (property == DrawingProperty)
             {
                 RaiseInvalidated(EventArgs.Empty);
             }