diff --git a/cmake/modules/RootBuildOptions.cmake b/cmake/modules/RootBuildOptions.cmake
index f267a42ed9ce0..f7a3dfdbc3387 100644
--- a/cmake/modules/RootBuildOptions.cmake
+++ b/cmake/modules/RootBuildOptions.cmake
@@ -420,12 +420,18 @@ foreach(opt afdsmgrd afs alien bonjour castor chirp cxx11 cxx14 cxx17 geocad gfa
 endforeach()
 
 #---Deprecated options------------------------------------------------------------------------
-foreach(opt cxxmodules exceptions oracle pythia6 pythia6_nolink pyroot-python2 minuit2)
+foreach(opt cxxmodules exceptions oracle pythia6 pythia6_nolink pyroot-python2)
   if(${opt})
     message(DEPRECATION ">>> Option '${opt}' is deprecated and will be removed in the next release of ROOT. Please contact root-dev@cern.ch should you still need it.")
   endif()
 endforeach()
 
+foreach(opt minuit2)
+  if(NOT ${opt})
+    message(DEPRECATION ">>> Option '${opt}' is deprecated: in the future it will always be set to ON. In the next release of ROOT, you will no longer be able to disable this feature. Please contact root-dev@cern.ch should you still need disabling it.")
+  endif()
+endforeach()
+
 foreach(opt minuit2_omp minuit2_mpi)
   if(${opt})
       message(WARNING "The option '${opt}' can only be used to minimise thread-safe functions in Minuit2. It cannot be used for Histogram/Graph fitting and for RooFit. If you want to use Minuit2 with OpenMP or MPI support, it is better to build Minuit2 as a standalone library.")
diff --git a/roofit/roofitcore/src/RooWorkspace.cxx b/roofit/roofitcore/src/RooWorkspace.cxx
index 24943323cb33e..ecc1a65313fd9 100644
--- a/roofit/roofitcore/src/RooWorkspace.cxx
+++ b/roofit/roofitcore/src/RooWorkspace.cxx
@@ -686,6 +686,7 @@ bool RooWorkspace::import(const RooAbsArg& inArg,
             << node->GetName() << endl ;
       }
       _allOwnedNodes.addOwned(std::unique_ptr<RooAbsArg>{node});
+      node->setWorkspace(*this);
       if (_openTrans) {
         _sandboxNodes.add(*node) ;
       } else {
diff --git a/roofit/xroofit/src/xRooNode.cxx b/roofit/xroofit/src/xRooNode.cxx
index 03d1d4217addf..cc1a5063b55f4 100644
--- a/roofit/xroofit/src/xRooNode.cxx
+++ b/roofit/xroofit/src/xRooNode.cxx
@@ -8079,6 +8079,9 @@ class PadRefresher {
          getLegend(false, true);
          fPad->GetCanvas()->Paint();
          fPad->GetCanvas()->Update();
+#if ROOT_VERSION_CODE >= ROOT_VERSION(6, 30, 00)
+         fPad->GetCanvas()->ResetUpdated(); // stops previous canvas being replaced in a jupyter notebook
+#endif
          fPad->cd();
       }
       nExisting--;
@@ -8122,9 +8125,8 @@ void xRooNode::Draw(Option_t *opt)
       if (gPad)
          gPad->Clear();
       xRooNLLVar::xRooHypoPoint(std::dynamic_pointer_cast<RooStats::HypoTestResult>(fComp)).Draw(opt);
-      if (gPad) {
-         gPad->GetCanvas()->Paint();
-         gPad->GetCanvas()->Update();
+      {
+         PadRefresher p(gPad); // refreshes the pad
       }
       gSystem->ProcessEvents();
       return;