diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/DeferredDrawingContextImpl.cs b/src/Avalonia.Visuals/Rendering/SceneGraph/DeferredDrawingContextImpl.cs
index d4564c9f29..f4c350eead 100644
--- a/src/Avalonia.Visuals/Rendering/SceneGraph/DeferredDrawingContextImpl.cs
+++ b/src/Avalonia.Visuals/Rendering/SceneGraph/DeferredDrawingContextImpl.cs
@@ -257,7 +257,7 @@ namespace Avalonia.Rendering.SceneGraph
         /// <inheritdoc/>
         public void PopBitmapBlendMode()
         {
-            var next = NextDrawAs<OpacityNode>();
+            var next = NextDrawAs<BitmapBlendModeNode>();
 
             if (next == null || !next.Item.Equals(null))
             {
@@ -377,7 +377,7 @@ namespace Avalonia.Rendering.SceneGraph
         /// <inheritdoc/>
         public void PushBitmapBlendMode(BitmapBlendingMode blendingMode)
         {
-            var next = NextDrawAs<OpacityNode>();
+            var next = NextDrawAs<BitmapBlendModeNode>();
 
             if (next == null || !next.Item.Equals(blendingMode))
             {
diff --git a/src/Windows/Avalonia.Direct2D1/Media/DrawingContextImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/DrawingContextImpl.cs
index efe581ae0d..af35934785 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/DrawingContextImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/DrawingContextImpl.cs
@@ -559,12 +559,12 @@ namespace Avalonia.Direct2D1.Media
 
         public void PushBitmapBlendMode(BitmapBlendingMode blendingMode)
         {
-            // Stubs for now
+            // TODO: Stubs for now
         }
 
         public void PopBitmapBlendMode()
         {
-            // Stubs for now
+            // TODO: Stubs for now
         }
 
         public void PushOpacityMask(IBrush mask, Rect bounds)