diff --git a/src/core/featuremodel.cpp b/src/core/featuremodel.cpp
index 19ca2f5cda..b500ebdfd5 100644
--- a/src/core/featuremodel.cpp
+++ b/src/core/featuremodel.cpp
@@ -707,7 +707,7 @@ void FeatureModel::applyGeometry()
         {
           ignoredFeature.insert( mLayer, QSet<QgsFeatureId>() << mFeature.id() );
         }
-        geometry.avoidIntersections( intersectionLayers, ignoredFeature );
+        geometry.avoidIntersectionsV2( intersectionLayers, ignoredFeature );
       }
     }
   }
diff --git a/src/core/layertreemodel.cpp b/src/core/layertreemodel.cpp
index f12a10d6f5..5f80dad6df 100644
--- a/src/core/layertreemodel.cpp
+++ b/src/core/layertreemodel.cpp
@@ -648,6 +648,9 @@ QVariant FlatLayerTreeModelBase::data( const QModelIndex &index, int role ) cons
           case Qgis::LayerType::Group:
             layerType = QStringLiteral( "grouplayer" );
             break;
+          case Qgis::LayerType::TiledScene:
+            layerType = QStringLiteral( "tiledscenelayer" );
+            break;
         }
       }
       return layerType;
@@ -1262,7 +1265,7 @@ void FlatLayerTreeModelBase::setLayerInTracking( QgsLayerTreeLayer *nodeLayer, b
 QgsRectangle FlatLayerTreeModelBase::nodeExtent( const QModelIndex &index, QgsQuickMapSettings *mapSettings, const float buffer )
 {
   QgsRectangle extent;
-  extent.setMinimal();
+  extent.setNull();
 
   const QModelIndex sourceIndex = mapToSource( index );
   if ( !sourceIndex.isValid() )
diff --git a/src/core/qgsquick/qgsquickelevationprofilecanvas.cpp b/src/core/qgsquick/qgsquickelevationprofilecanvas.cpp
index 4b9150b274..ea276cdb0f 100644
--- a/src/core/qgsquick/qgsquickelevationprofilecanvas.cpp
+++ b/src/core/qgsquick/qgsquickelevationprofilecanvas.cpp
@@ -244,6 +244,7 @@ void QgsQuickElevationProfileCanvas::setupLayerConnections( QgsMapLayer *layer,
     case Qgis::LayerType::Annotation:
     case Qgis::LayerType::PointCloud:
     case Qgis::LayerType::Group:
+    case Qgis::LayerType::TiledScene:
       break;
   }
 }
diff --git a/src/core/utils/geometryutils.cpp b/src/core/utils/geometryutils.cpp
index 28dbebfdc0..0c4a46abf4 100644
--- a/src/core/utils/geometryutils.cpp
+++ b/src/core/utils/geometryutils.cpp
@@ -88,7 +88,7 @@ GeometryUtils::GeometryOperationResult GeometryUtils::reshapeFromRubberband( Qgs
       {
         QHash<QgsVectorLayer *, QSet<QgsFeatureId>> ignoredFeature;
         ignoredFeature.insert( layer, QSet<QgsFeatureId>() << fid );
-        geom.avoidIntersections( avoidIntersectionsLayers, ignoredFeature );
+        geom.avoidIntersectionsV2( avoidIntersectionsLayers, ignoredFeature );
       }
 
       if ( geom.isEmpty() ) //intersection removal might have removed the whole geometry