diff --git a/examples/fluids/advection.yaml b/examples/fluids/advection.yaml
index d194093418..083c03a1fd 100644
--- a/examples/fluids/advection.yaml
+++ b/examples/fluids/advection.yaml
@@ -25,7 +25,7 @@ snes:
 
 implicit:
 ts:
-  dt: 1e-3
+  time_step: 1e-3
   type: alpha
   max_steps: 10
 
diff --git a/examples/fluids/blasius.yaml b/examples/fluids/blasius.yaml
index dfd813807a..155ba40e1a 100644
--- a/examples/fluids/blasius.yaml
+++ b/examples/fluids/blasius.yaml
@@ -4,7 +4,7 @@ implicit: true
 ts:
   adapt_type: 'none'
   type: 'beuler'
-  dt: 2e-6
+  time_step: 2e-6
   max_time: 1.0e-3
   #monitor_solution: cgns:blasius-%d.cgns
   #monitor_solution_interval: 10
diff --git a/examples/fluids/channel.yaml b/examples/fluids/channel.yaml
index 1028c86e81..e0f76306c0 100644
--- a/examples/fluids/channel.yaml
+++ b/examples/fluids/channel.yaml
@@ -6,7 +6,7 @@ implicit: true
 ts:
   type: 'beuler'
   adapt_type: 'none'
-  dt: 5e-6
+  time_step: 5e-6
 
 q_extra: 2
 
diff --git a/examples/fluids/gaussianwave.yaml b/examples/fluids/gaussianwave.yaml
index 606c002419..339c92790f 100644
--- a/examples/fluids/gaussianwave.yaml
+++ b/examples/fluids/gaussianwave.yaml
@@ -22,7 +22,7 @@ width: 0.05
 ts:
   adapt_type: none
   max_steps: 100
-  dt: 2e-3
+  time_step: 2e-3
   type: alpha
   #monitor_solution: cgns:nwave.cgns
   #monitor_solution_interval: 10
diff --git a/examples/fluids/navierstokes.c b/examples/fluids/navierstokes.c
index 0b674bd660..24331772d7 100644
--- a/examples/fluids/navierstokes.c
+++ b/examples/fluids/navierstokes.c
@@ -21,7 +21,7 @@
 //TESTARGS(name="Newtonian and Riemann Solver Unit Tests",only="cpu") -ceed {ceed_resource} -test_type solver -options_file examples/fluids/gaussianwave.yaml -compare_final_state_atol 1e100 -compare_final_state_filename examples/fluids/tests-output/fluids-navierstokes-gaussianwave-IDL-entropy.bin -dm_plex_box_faces 5,5,1 -ts_max_steps 0 -newtonian_unit_tests -riemann_solver_unit_tests
 //TESTARGS(name="Gaussian Wave, IDL and Entropy variables") -ceed {ceed_resource} -test_type solver -options_file examples/fluids/gaussianwave.yaml -compare_final_state_atol 2e-11 -compare_final_state_filename examples/fluids/tests-output/fluids-navierstokes-gaussianwave-IDL-entropy.bin -state_var entropy -dm_plex_box_faces 5,5,1 -ts_max_steps 5 -idl_decay_time 2e-3 -idl_length 0.25 -idl_start 0 -idl_pressure 70
 //TESTARGS(name="Gaussian Wave, explicit, supg, IDL") -ceed {ceed_resource} -test_type solver -options_file examples/fluids/gaussianwave.yaml -compare_final_state_atol 1e-8 -compare_final_state_filename examples/fluids/tests-output/fluids-navierstokes-gaussianwave-explicit.bin -dm_plex_box_faces 2,2,1 -ts_max_steps 5 -degree 3 -implicit false -ts_type rk -stab supg -state_var conservative -mass_ksp_type gmres -mass_pc_jacobi_type diagonal -idl_decay_time 2e-3 -idl_length 0.25 -idl_start 0 -idl_pressure 70
-//TESTARGS(name="Advection 2D, rotation, explicit, supg, consistent mass") -ceed {ceed_resource} -test_type solver -problem advection -degree 3 -dm_plex_box_faces 2,2 -dm_plex_box_lower 0,0 -dm_plex_box_upper 125,125 -bc_wall 1,2,3,4 -wall_comps 4 -units_kilogram 1e-9 -rc 100. -ts_dt 1e-3 -ts_max_steps 10 -stab supg -Ctaus 0.5 -mass_ksp_type gmres -mass_pc_type vpbjacobi -compare_final_state_atol 1e-10 -compare_final_state_filename examples/fluids/tests-output/fluids-navierstokes-adv2d-rotation-explicit-stab-supg-consistent-mass.bin
+//TESTARGS(name="Advection 2D, rotation, explicit, supg, consistent mass") -ceed {ceed_resource} -test_type solver -problem advection -degree 3 -dm_plex_box_faces 2,2 -dm_plex_box_lower 0,0 -dm_plex_box_upper 125,125 -bc_wall 1,2,3,4 -wall_comps 4 -units_kilogram 1e-9 -rc 100. -ts_time_step 1e-3 -ts_max_steps 10 -stab supg -Ctaus 0.5 -mass_ksp_type gmres -mass_pc_type vpbjacobi -compare_final_state_atol 1e-10 -compare_final_state_filename examples/fluids/tests-output/fluids-navierstokes-adv2d-rotation-explicit-stab-supg-consistent-mass.bin
 //TESTARGS(name="Advection, skew") -ceed {ceed_resource} -test_type solver -options_file examples/fluids/advection.yaml -ts_max_steps 5 -wind_type translation -wind_translation -0.5547002,0.83205029,0 -advection_ic_type skew  -dm_plex_box_faces 2,1,1 -degree 2 -stab supg -stab_tau advdiff_shakib -Ctau_a 4 -ksp_type gmres -diffusion_coeff 5e-4 -compare_final_state_atol 7e-10 -compare_final_state_filename examples/fluids/tests-output/fluids-navierstokes-adv-skew.bin
 //TESTARGS(name="Blasius, bc_slip") -ceed {ceed_resource} -test_type solver -options_file examples/fluids/blasius.yaml -ts_max_steps 5 -dm_plex_box_faces 3,20,1 -platemesh_nDelta 10 -platemesh_growth 1.2 -bc_outflow 5 -bc_slip 4 -compare_final_state_atol 2E-11 -compare_final_state_filename examples/fluids/tests-output/fluids-navierstokes-blasius-bc_slip.bin
 //TESTARGS(name="Advection, rotation, cosine") -ceed {ceed_resource} -test_type solver -options_file examples/fluids/advection.yaml -ts_max_steps 0 -advection_ic_type cosine_hill -dm_plex_box_faces 2,1,1 -compare_final_state_atol 1e-10 -compare_final_state_filename examples/fluids/tests-output/fluids-navierstokes-adv-rotation-cosine.bin
@@ -37,14 +37,14 @@
 //TESTARGS(name="Blasius, Strong STG Inflow") -ceed {ceed_resource} -test_type solver -options_file examples/fluids/tests-output/blasius_stgtest.yaml -compare_final_state_atol 1E-10 -compare_final_state_filename examples/fluids/tests-output/fluids-navierstokes-blasius_STG_strongBC.bin -stg_strong true
 //TESTARGS(name="Channel") -ceed {ceed_resource} -test_type solver -options_file examples/fluids/channel.yaml -compare_final_state_atol 2e-11 -compare_final_state_filename examples/fluids/tests-output/fluids-navierstokes-channel.bin -dm_plex_box_faces 5,5,1 -ts_max_steps 5
 //TESTARGS(name="Channel, Primitive") -ceed {ceed_resource} -test_type solver -options_file examples/fluids/channel.yaml -compare_final_state_atol 2e-11 -compare_final_state_filename examples/fluids/tests-output/fluids-navierstokes-channel-prim.bin -dm_plex_box_faces 5,5,1 -ts_max_steps 5 -state_var primitive
-//TESTARGS(name="Density Current, explicit") -ceed {ceed_resource} -test_type solver -degree 3 -q_extra 2 -dm_plex_box_faces 1,1,2 -dm_plex_box_lower 0,0,0 -dm_plex_box_upper 125,125,250 -dm_plex_dim 3 -bc_symmetry_x 5,6 -bc_symmetry_y 3,4 -bc_symmetry_z 1,2 -units_kilogram 1e-9 -center 62.5,62.5,187.5 -rc 100. -thetaC -35. -mu 75 -gravity 0,0,-9.81 -ts_dt 1e-3 -units_meter 1e-2 -units_second 1e-2 -ts_max_steps 10 -compare_final_state_atol 1E-11 -compare_final_state_filename examples/fluids/tests-output/fluids-navierstokes-dc-explicit.bin
-//TESTARGS(name="Density Current, implicit, no stabilization") -ceed {ceed_resource} -test_type solver -degree 3 -dm_plex_box_faces 1,1,2 -dm_plex_box_lower 0,0,0 -dm_plex_box_upper 125,125,250 -dm_plex_dim 3 -bc_symmetry_x 5,6 -bc_symmetry_y 3,4 -bc_symmetry_z 1,2 -units_kilogram 1e-9 -center 62.5,62.5,187.5 -rc 100. -thetaC -35. -mu 75 -gravity 0,0,-9.81 -units_meter 1e-2 -units_second 1e-2 -ksp_atol 1e-4 -ksp_rtol 1e-3 -ksp_type bcgs -snes_atol 1e-3 -snes_lag_jacobian 100 -snes_lag_jacobian_persists -snes_mf_operator -ts_dt 1e-3 -implicit -ts_type alpha -ts_max_steps 10 -compare_final_state_atol 5E-4 -compare_final_state_filename examples/fluids/tests-output/fluids-navierstokes-dc-implicit-stab-none.bin
-//TESTARGS(name="Advection, rotation, implicit, SUPG stabilization") -ceed {ceed_resource} -test_type solver -problem advection -CtauS .3 -stab supg -degree 3 -dm_plex_box_faces 1,1,2 -dm_plex_box_lower 0,0,0 -dm_plex_box_upper 125,125,250 -dm_plex_dim 3 -bc_wall 1,2,3,4,5,6 -wall_comps 4 -units_kilogram 1e-9 -rc 100. -ksp_atol 1e-4 -ksp_rtol 1e-3 -ksp_type bcgs -snes_atol 1e-3 -snes_lag_jacobian 100 -snes_lag_jacobian_persists -snes_mf_operator -ts_dt 1e-3 -implicit -dm_mat_preallocate_skip 0 -ts_type alpha -compare_final_state_atol 5E-4 -ts_max_steps 10 -compare_final_state_filename examples/fluids/tests-output/fluids-navierstokes-adv-rotation-implicit-stab-supg.bin
-//TESTARGS(name="Advection, translation, implicit, SU stabilization") -ceed {ceed_resource} -test_type solver -problem advection -CtauS .3 -stab su -degree 3 -dm_plex_box_faces 1,1,2 -dm_plex_box_lower 0,0,0 -dm_plex_box_upper 125,125,250 -dm_plex_dim 3 -units_kilogram 1e-9 -rc 100. -ksp_atol 1e-4 -ksp_rtol 1e-3 -ksp_type bcgs -snes_atol 1e-3 -snes_lag_jacobian 100 -snes_lag_jacobian_persists -snes_mf_operator -ts_dt 1e-3 -implicit -dm_mat_preallocate_skip 0 -ts_type alpha -wind_type translation -wind_translation .53,-1.33,-2.65 -bc_inflow 1,2,3,4,5,6 -ts_max_steps 10 -compare_final_state_atol 5E-4 -compare_final_state_filename examples/fluids/tests-output/fluids-navierstokes-adv-translation-implicit-stab-su.bin
-//TESTARGS(name="Advection 2D, rotation, explicit, strong form") -ceed {ceed_resource} -test_type solver -problem advection -strong_form 1 -degree 3 -dm_plex_box_faces 2,2 -dm_plex_box_lower 0,0 -dm_plex_box_upper 125,125 -bc_wall 1,2,3,4 -wall_comps 4 -units_kilogram 1e-9 -rc 100. -ts_dt 1e-3 -compare_final_state_atol 5E-11 -ts_max_steps 10 -compare_final_state_filename examples/fluids/tests-output/fluids-navierstokes-adv2d-rotation-explicit-strong.bin
-//TESTARGS(name="Advection 2D, rotation, implicit, SUPG stabilization") -ceed {ceed_resource} -test_type solver -problem advection -CtauS .3 -stab supg -degree 3 -dm_plex_box_faces 1,1,2 -dm_plex_box_lower 0,0 -dm_plex_box_upper 125,125 -bc_wall 1,2,3,4 -wall_comps 4 -units_kilogram 1e-9 -rc 100. -ksp_atol 1e-4 -ksp_rtol 1e-3 -ksp_type bcgs -snes_atol 1e-3 -snes_lag_jacobian 100 -snes_lag_jacobian_persists -snes_mf_operator -ts_dt 1e-3 -implicit -dm_mat_preallocate_skip 0 -ts_type alpha -ts_max_steps 10 -compare_final_state_atol 5E-4 -compare_final_state_filename examples/fluids/tests-output/fluids-navierstokes-adv2d-rotation-implicit-stab-supg.bin
-//TESTARGS(name="Euler, implicit") -ceed {ceed_resource} -test_type solver -problem euler_vortex -degree 3 -dm_plex_box_faces 1,1,2 -dm_plex_box_lower 0,0,0 -dm_plex_box_upper 125,125,250 -dm_plex_dim 3 -units_meter 1e-4 -units_second 1e-4 -mean_velocity 1.4,-2.,0 -bc_inflow 4,6 -bc_outflow 3,5 -bc_symmetry_z 1,2 -vortex_strength 2 -ksp_atol 1e-4 -ksp_rtol 1e-3 -ksp_type bcgs -snes_atol 1e-3 -snes_lag_jacobian 100 -snes_lag_jacobian_persists -snes_mf_operator -ts_dt 1e-3 -implicit -dm_mat_preallocate_skip 0 -ts_type alpha -ts_max_steps 10 -compare_final_state_atol 5E-4 -compare_final_state_filename examples/fluids/tests-output/fluids-navierstokes-euler-implicit.bin
-//TESTARGS(name="Euler, explicit") -ceed {ceed_resource} -test_type solver -problem euler_vortex -degree 3 -q_extra 2 -dm_plex_box_faces 2,2,1 -dm_plex_box_lower 0,0,0 -dm_plex_box_upper 125,125,250 -dm_plex_dim 3 -units_meter 1e-4 -units_second 1e-4 -mean_velocity 1.4,-2.,0 -bc_inflow 4,6 -bc_outflow 3,5 -bc_symmetry_z 1,2 -vortex_strength 2 -ts_dt 1e-7 -ts_rk_type 5bs -ts_rtol 1e-10 -ts_atol 1e-10 -ts_max_steps 10 -compare_final_state_atol 1E-7 -compare_final_state_filename examples/fluids/tests-output/fluids-navierstokes-euler-explicit.bin
+//TESTARGS(name="Density Current, explicit") -ceed {ceed_resource} -test_type solver -degree 3 -q_extra 2 -dm_plex_box_faces 1,1,2 -dm_plex_box_lower 0,0,0 -dm_plex_box_upper 125,125,250 -dm_plex_dim 3 -bc_symmetry_x 5,6 -bc_symmetry_y 3,4 -bc_symmetry_z 1,2 -units_kilogram 1e-9 -center 62.5,62.5,187.5 -rc 100. -thetaC -35. -mu 75 -gravity 0,0,-9.81 -ts_time_step 1e-3 -units_meter 1e-2 -units_second 1e-2 -ts_max_steps 10 -compare_final_state_atol 1E-11 -compare_final_state_filename examples/fluids/tests-output/fluids-navierstokes-dc-explicit.bin
+//TESTARGS(name="Density Current, implicit, no stabilization") -ceed {ceed_resource} -test_type solver -degree 3 -dm_plex_box_faces 1,1,2 -dm_plex_box_lower 0,0,0 -dm_plex_box_upper 125,125,250 -dm_plex_dim 3 -bc_symmetry_x 5,6 -bc_symmetry_y 3,4 -bc_symmetry_z 1,2 -units_kilogram 1e-9 -center 62.5,62.5,187.5 -rc 100. -thetaC -35. -mu 75 -gravity 0,0,-9.81 -units_meter 1e-2 -units_second 1e-2 -ksp_atol 1e-4 -ksp_rtol 1e-3 -ksp_type bcgs -snes_atol 1e-3 -snes_lag_jacobian 100 -snes_lag_jacobian_persists -snes_mf_operator -ts_time_step 1e-3 -implicit -ts_type alpha -ts_max_steps 10 -compare_final_state_atol 5E-4 -compare_final_state_filename examples/fluids/tests-output/fluids-navierstokes-dc-implicit-stab-none.bin
+//TESTARGS(name="Advection, rotation, implicit, SUPG stabilization") -ceed {ceed_resource} -test_type solver -problem advection -CtauS .3 -stab supg -degree 3 -dm_plex_box_faces 1,1,2 -dm_plex_box_lower 0,0,0 -dm_plex_box_upper 125,125,250 -dm_plex_dim 3 -bc_wall 1,2,3,4,5,6 -wall_comps 4 -units_kilogram 1e-9 -rc 100. -ksp_atol 1e-4 -ksp_rtol 1e-3 -ksp_type bcgs -snes_atol 1e-3 -snes_lag_jacobian 100 -snes_lag_jacobian_persists -snes_mf_operator -ts_time_step 1e-3 -implicit -dm_mat_preallocate_skip 0 -ts_type alpha -compare_final_state_atol 5E-4 -ts_max_steps 10 -compare_final_state_filename examples/fluids/tests-output/fluids-navierstokes-adv-rotation-implicit-stab-supg.bin
+//TESTARGS(name="Advection, translation, implicit, SU stabilization") -ceed {ceed_resource} -test_type solver -problem advection -CtauS .3 -stab su -degree 3 -dm_plex_box_faces 1,1,2 -dm_plex_box_lower 0,0,0 -dm_plex_box_upper 125,125,250 -dm_plex_dim 3 -units_kilogram 1e-9 -rc 100. -ksp_atol 1e-4 -ksp_rtol 1e-3 -ksp_type bcgs -snes_atol 1e-3 -snes_lag_jacobian 100 -snes_lag_jacobian_persists -snes_mf_operator -ts_time_step 1e-3 -implicit -dm_mat_preallocate_skip 0 -ts_type alpha -wind_type translation -wind_translation .53,-1.33,-2.65 -bc_inflow 1,2,3,4,5,6 -ts_max_steps 10 -compare_final_state_atol 5E-4 -compare_final_state_filename examples/fluids/tests-output/fluids-navierstokes-adv-translation-implicit-stab-su.bin
+//TESTARGS(name="Advection 2D, rotation, explicit, strong form") -ceed {ceed_resource} -test_type solver -problem advection -strong_form 1 -degree 3 -dm_plex_box_faces 2,2 -dm_plex_box_lower 0,0 -dm_plex_box_upper 125,125 -bc_wall 1,2,3,4 -wall_comps 4 -units_kilogram 1e-9 -rc 100. -ts_time_step 1e-3 -compare_final_state_atol 5E-11 -ts_max_steps 10 -compare_final_state_filename examples/fluids/tests-output/fluids-navierstokes-adv2d-rotation-explicit-strong.bin
+//TESTARGS(name="Advection 2D, rotation, implicit, SUPG stabilization") -ceed {ceed_resource} -test_type solver -problem advection -CtauS .3 -stab supg -degree 3 -dm_plex_box_faces 1,1,2 -dm_plex_box_lower 0,0 -dm_plex_box_upper 125,125 -bc_wall 1,2,3,4 -wall_comps 4 -units_kilogram 1e-9 -rc 100. -ksp_atol 1e-4 -ksp_rtol 1e-3 -ksp_type bcgs -snes_atol 1e-3 -snes_lag_jacobian 100 -snes_lag_jacobian_persists -snes_mf_operator -ts_time_step 1e-3 -implicit -dm_mat_preallocate_skip 0 -ts_type alpha -ts_max_steps 10 -compare_final_state_atol 5E-4 -compare_final_state_filename examples/fluids/tests-output/fluids-navierstokes-adv2d-rotation-implicit-stab-supg.bin
+//TESTARGS(name="Euler, implicit") -ceed {ceed_resource} -test_type solver -problem euler_vortex -degree 3 -dm_plex_box_faces 1,1,2 -dm_plex_box_lower 0,0,0 -dm_plex_box_upper 125,125,250 -dm_plex_dim 3 -units_meter 1e-4 -units_second 1e-4 -mean_velocity 1.4,-2.,0 -bc_inflow 4,6 -bc_outflow 3,5 -bc_symmetry_z 1,2 -vortex_strength 2 -ksp_atol 1e-4 -ksp_rtol 1e-3 -ksp_type bcgs -snes_atol 1e-3 -snes_lag_jacobian 100 -snes_lag_jacobian_persists -snes_mf_operator -ts_time_step 1e-3 -implicit -dm_mat_preallocate_skip 0 -ts_type alpha -ts_max_steps 10 -compare_final_state_atol 5E-4 -compare_final_state_filename examples/fluids/tests-output/fluids-navierstokes-euler-implicit.bin
+//TESTARGS(name="Euler, explicit") -ceed {ceed_resource} -test_type solver -problem euler_vortex -degree 3 -q_extra 2 -dm_plex_box_faces 2,2,1 -dm_plex_box_lower 0,0,0 -dm_plex_box_upper 125,125,250 -dm_plex_dim 3 -units_meter 1e-4 -units_second 1e-4 -mean_velocity 1.4,-2.,0 -bc_inflow 4,6 -bc_outflow 3,5 -bc_symmetry_z 1,2 -vortex_strength 2 -ts_time_step 1e-7 -ts_rk_type 5bs -ts_rtol 1e-10 -ts_atol 1e-10 -ts_max_steps 10 -compare_final_state_atol 1E-7 -compare_final_state_filename examples/fluids/tests-output/fluids-navierstokes-euler-explicit.bin
 //TESTARGS(name="Sod Shocktube, explicit, SU stabilization, y-z-beta shock capturing") -ceed {ceed_resource} -test_type solver -problem shocktube -degree 1 -q_extra 2 -dm_plex_box_faces 50,1,1 -units_meter 1e-2 units_second 1e-2 -dm_plex_box_lower 0,0,0 -dm_plex_box_upper 1000,20,20 -dm_plex_dim 3 -bc_symmetry_x 5,6 -bc_symmetry_y 3,4 -bc_symmetry_z 1,2 -yzb -stab su -ts_max_steps 10 -compare_final_state_atol 1E-11 -compare_final_state_filename examples/fluids/tests-output/fluids-navierstokes-shocktube-explicit-su-yzb.bin
 
 /// @file
diff --git a/examples/fluids/navierstokes.h b/examples/fluids/navierstokes.h
index 26ba140814..16b08f4f93 100644
--- a/examples/fluids/navierstokes.h
+++ b/examples/fluids/navierstokes.h
@@ -17,8 +17,8 @@
 #include "./include/petsc_ops.h"
 #include "qfunctions/newtonian_types.h"
 
-#if PETSC_VERSION_LT(3, 23, 0)
-#error "PETSc v3.23 or later is required"
+#if PETSC_VERSION_LT(3, 25, 0)
+#error "PETSc v3.25 or later is required"
 #endif
 
 // -----------------------------------------------------------------------------
diff --git a/examples/fluids/src/dm_utils.c b/examples/fluids/src/dm_utils.c
index b7a1bf8ea7..1a18ae6975 100644
--- a/examples/fluids/src/dm_utils.c
+++ b/examples/fluids/src/dm_utils.c
@@ -456,7 +456,7 @@ PetscErrorCode DMSetupByOrderBegin_FEM(PetscBool setup_faces, PetscBool setup_co
     if (coord_order != PETSC_DECIDE) fe_coord_order = coord_order;
     PetscCall(PetscFECreateLagrange(comm, dim, num_comp_coord, is_simplex, fe_coord_order, q_order, &fe_coord_new));
     if (setup_faces) PetscCall(PetscFEGetHeightSubspace(fe_coord_new, 1, &fe_coord_face_new));
-    PetscCall(DMSetCoordinateDisc(dm, fe_coord_new, PETSC_TRUE));
+    PetscCall(DMSetCoordinateDisc(dm, fe_coord_new, PETSC_FALSE, PETSC_TRUE));
     PetscCall(PetscFEDestroy(&fe_coord_new));
   }
   PetscFunctionReturn(PETSC_SUCCESS);
diff --git a/examples/fluids/src/turb_spanstats.c b/examples/fluids/src/turb_spanstats.c
index 942efc38a7..f2664f456d 100644
--- a/examples/fluids/src/turb_spanstats.c
+++ b/examples/fluids/src/turb_spanstats.c
@@ -71,8 +71,8 @@ PetscErrorCode CreateStatsDM(User user, ProblemData problem, PetscInt degree) {
     }
 
     PetscCall(DMPlexLabelComplete(user->dm, label));
-    PetscCall(DMPlexFilter(user->dm, label, 1, PETSC_FALSE, PETSC_FALSE, NULL, &user->spanstats.dm));
-    PetscCall(DMSetCoordinateDisc(user->spanstats.dm, NULL, PETSC_TRUE));  // Ensure that a coordinate FE exists
+    PetscCall(DMPlexFilter(user->dm, label, 1, PETSC_FALSE, PETSC_FALSE, PetscObjectComm((PetscObject)user->dm), NULL, &user->spanstats.dm));
+    PetscCall(DMSetCoordinateDisc(user->spanstats.dm, NULL, PETSC_FALSE, PETSC_TRUE));  // Ensure that a coordinate FE exists
 
     PetscCall(DMPlexDistribute(user->spanstats.dm, 0, NULL, &parent_distributed_dm));
     PetscCallMPI(MPI_Comm_size(comm, &size));
diff --git a/examples/fluids/tests-output/blasius_stgtest.yaml b/examples/fluids/tests-output/blasius_stgtest.yaml
index e93e4f7c5e..81f36885c6 100644
--- a/examples/fluids/tests-output/blasius_stgtest.yaml
+++ b/examples/fluids/tests-output/blasius_stgtest.yaml
@@ -4,7 +4,7 @@ implicit: true
 ts:
   adapt_type: 'none'
   type: 'beuler'
-  dt: 2e-6
+  time_step: 2e-6
   max_steps: 5
 
 dm_plex_box_faces: 3,20,1
diff --git a/examples/fluids/tests-output/blasius_test.yaml b/examples/fluids/tests-output/blasius_test.yaml
index b72662bcee..14c7a5eba7 100644
--- a/examples/fluids/tests-output/blasius_test.yaml
+++ b/examples/fluids/tests-output/blasius_test.yaml
@@ -4,7 +4,7 @@ implicit: true
 ts:
   adapt_type: 'none'
   type: 'beuler'
-  dt: 2e-6
+  time_step: 2e-6
   max_steps: 5
 
 dm_plex_box_faces: 3,20,1
diff --git a/examples/fluids/tests-output/stats_test.yaml b/examples/fluids/tests-output/stats_test.yaml
index 667e446f27..18992eb27e 100644
--- a/examples/fluids/tests-output/stats_test.yaml
+++ b/examples/fluids/tests-output/stats_test.yaml
@@ -4,7 +4,7 @@ implicit: true
 ts:
   adapt_type: 'none'
   type: 'beuler'
-  dt: 2e-6
+  time_step: 2e-6
   max_steps: 10
 
 dm_plex_box_faces: 3,20,2
diff --git a/examples/fluids/vortexshedding.yaml b/examples/fluids/vortexshedding.yaml
index 9b910da328..2a7a2c3151 100644
--- a/examples/fluids/vortexshedding.yaml
+++ b/examples/fluids/vortexshedding.yaml
@@ -9,7 +9,7 @@ checkpoint_interval: 10
 ts:
   adapt_type: 'none'
   type: alpha
-  dt: .05
+  time_step: .05
   max_time: 100
   alpha_radius: 0.5
   monitor_solution: cgns:vortexshedding-q3-g1-n08.cgns
diff --git a/examples/petsc/dmswarm.c b/examples/petsc/dmswarm.c
index fa95f16979..7f1b5ad9cf 100644
--- a/examples/petsc/dmswarm.c
+++ b/examples/petsc/dmswarm.c
@@ -154,7 +154,7 @@ int main(int argc, char **argv) {
       PetscFE fe_coord;
 
       PetscCall(PetscFECreateLagrange(comm, dim, dim, PETSC_FALSE, mesh_order, solution_order + q_extra, &fe_coord));
-      PetscCall(DMSetCoordinateDisc(dm_mesh, fe_coord, PETSC_TRUE));
+      PetscCall(DMSetCoordinateDisc(dm_mesh, fe_coord, PETSC_FALSE, PETSC_TRUE));
       PetscCall(PetscFEDestroy(&fe_coord));
     }
 
diff --git a/examples/petsc/include/petscversion.h b/examples/petsc/include/petscversion.h
index 426aeae2ba..e9d4cceedf 100644
--- a/examples/petsc/include/petscversion.h
+++ b/examples/petsc/include/petscversion.h
@@ -9,6 +9,6 @@
 /// Petsc version check
 #pragma once
 
-#if PETSC_VERSION_LT(3, 23, 0)
-#error "PETSc v3.23 or later is required"
+#if PETSC_VERSION_LT(3, 25, 0)
+#error "PETSc v3.25 or later is required"
 #endif
diff --git a/examples/petsc/src/petscutils.c b/examples/petsc/src/petscutils.c
index 1c4076ed10..d968b95a5b 100644
--- a/examples/petsc/src/petscutils.c
+++ b/examples/petsc/src/petscutils.c
@@ -153,7 +153,7 @@ PetscErrorCode SetupDMByDegree(DM dm, PetscInt p_degree, PetscInt q_extra, Petsc
     PetscInt num_comp_coord;
     PetscCall(DMGetCoordinateDim(dm, &num_comp_coord));
     PetscCall(PetscFECreateLagrange(comm, dim, num_comp_coord, is_simplex, 1, q_degree, &fe_coords));
-    PetscCall(DMSetCoordinateDisc(dm, fe_coords, PETSC_TRUE));
+    PetscCall(DMSetCoordinateDisc(dm, fe_coords, PETSC_FALSE, PETSC_TRUE));
     PetscCall(PetscFEDestroy(&fe_coords));
   }
 
diff --git a/examples/solids/elasticity.c b/examples/solids/elasticity.c
index 6c7db8fe97..e721802fa0 100644
--- a/examples/solids/elasticity.c
+++ b/examples/solids/elasticity.c
@@ -507,7 +507,7 @@ int main(int argc, char **argv) {
         // ---------- Smoother KSP
         PetscCall(PCMGGetSmoother(pc, level, &ksp_smoother));
         PetscCall(KSPSetDM(ksp_smoother, level_dms[level]));
-        PetscCall(KSPSetDMActive(ksp_smoother, PETSC_FALSE));
+        PetscCall(KSPSetDMActive(ksp_smoother, KSP_DMACTIVE_ALL, PETSC_FALSE));
 
         // ---------- Chebyshev options
         PetscCall(KSPSetType(ksp_smoother, KSPCHEBYSHEV));
diff --git a/examples/solids/elasticity.h b/examples/solids/elasticity.h
index 9458668b30..966430ab80 100644
--- a/examples/solids/elasticity.h
+++ b/examples/solids/elasticity.h
@@ -21,6 +21,6 @@
 #include "include/utils.h"
 #include "problems/problems.h"
 
-#if PETSC_VERSION_LT(3, 23, 0)
-#error "PETSc v3.23 or later is required"
+#if PETSC_VERSION_LT(3, 25, 0)
+#error "PETSc v3.25 or later is required"
 #endif
diff --git a/examples/solids/src/setup-dm.c b/examples/solids/src/setup-dm.c
index 9a4d55a356..9e97e71d28 100644
--- a/examples/solids/src/setup-dm.c
+++ b/examples/solids/src/setup-dm.c
@@ -86,7 +86,7 @@ PetscErrorCode SetupDMByDegree(DM dm, AppCtx app_ctx, PetscInt order, PetscBool
     PetscInt num_comp_coord;
     PetscCall(DMGetCoordinateDim(dm, &num_comp_coord));
     PetscCall(PetscFECreateLagrange(comm, dim, num_comp_coord, PETSC_FALSE, 1, 1, &fe_coords));
-    PetscCall(DMSetCoordinateDisc(dm, fe_coords, PETSC_TRUE));
+    PetscCall(DMSetCoordinateDisc(dm, fe_coords, PETSC_FALSE, PETSC_TRUE));
     PetscCall(PetscFEDestroy(&fe_coords));
   }