diff --git a/config/model_configs/box_analytic_cosine_mountain_test.yml b/config/model_configs/box_analytic_cosine_mountain_test.yml
index cbccbe47d88..2c634847959 100644
--- a/config/model_configs/box_analytic_cosine_mountain_test.yml
+++ b/config/model_configs/box_analytic_cosine_mountain_test.yml
@@ -9,7 +9,7 @@ x_elem: 30
 y_elem: 30
 z_elem: 100
 z_stretch: false
-dt: "8secs"
+dt: "6secs"
 t_end: "24hours"
 use_reference_state: false
 rayleigh_sponge: true
diff --git a/config/model_configs/plane_analytic_cosine_mountain_test.yml b/config/model_configs/plane_analytic_cosine_mountain_test.yml
index cdfa35f157d..308cd9fb054 100644
--- a/config/model_configs/plane_analytic_cosine_mountain_test.yml
+++ b/config/model_configs/plane_analytic_cosine_mountain_test.yml
@@ -7,7 +7,7 @@ z_max: 21e3
 x_elem: 30
 z_elem: 100
 z_stretch: false
-dt: "8secs"
+dt: "6secs"
 t_end: "24hours"
 use_reference_state: false
 rayleigh_sponge: true
diff --git a/src/ClimaAtmos.jl b/src/ClimaAtmos.jl
index a589dfc6644..c8b1a32a117 100644
--- a/src/ClimaAtmos.jl
+++ b/src/ClimaAtmos.jl
@@ -1,5 +1,6 @@
 module ClimaAtmos
 
+include("fix_1d_spectral_space_on_gpu.jl")
 # include("disable_topography_dss.jl")
 
 using NVTX, Colors
diff --git a/src/analytic_solutions/analytic_solutions.jl b/src/analytic_solutions/analytic_solutions.jl
index b88d309ea59..15eb0093bf1 100644
--- a/src/analytic_solutions/analytic_solutions.jl
+++ b/src/analytic_solutions/analytic_solutions.jl
@@ -43,9 +43,6 @@ function initial_thermo_state(params, coord)
     T_min = FT(100)
     z_iso = log((T_min / T_sfc - a) / (1 - a)) / β
     p_iso = p_sfc * ((1 - a) / (1 - a * T_sfc / T_min))^(cp_d / R_d)
-    z > z_iso &&
-        @warn "Extending constant-N profile with isothermal profile above T = \
-               $T_min (z = $z_iso)" maxlog = 1
 
     # The perturbation in approximate_FΔuvw is computed around a background
     # state that is not hydrostatically balanced and is unphysical above 30 km,
diff --git a/src/disable_topography_dss.jl b/src/disable_topography_dss.jl
index a34b37cdbd7..79bbbbd8e19 100644
--- a/src/disable_topography_dss.jl
+++ b/src/disable_topography_dss.jl
@@ -2,7 +2,6 @@ import ClimaCore:
     DataLayouts,
     Geometry,
     Topologies,
-    Quadratures,
     Grids,
     Hypsography,
     Spaces,
@@ -10,8 +9,7 @@ import ClimaCore:
     Operators
 import ClimaTimeSteppers
 import ClimaComms
-using StaticArrays: SVector, SMatrix
-using LinearAlgebra: adjoint, Adjoint, ldiv!, DenseMatrix, lu, norm
+import LinearAlgebra: adjoint, ldiv!, DenseMatrix, lu, norm
 
 ClimaTimeSteppers.NVTX.@annotate function ClimaTimeSteppers.solve_newton!(
     alg::ClimaTimeSteppers.NewtonsMethod,
diff --git a/src/utils/common_spaces.jl b/src/utils/common_spaces.jl
index 7feb5f38059..f12e89dc3b4 100644
--- a/src/utils/common_spaces.jl
+++ b/src/utils/common_spaces.jl
@@ -120,6 +120,14 @@ function make_hybrid_spaces(
             hypsography =
                 Hypsography.LinearAdaption(Geometry.ZPoint.(z_surface))
         end
+        @show device
+        @show ClimaComms.device(Fields.coordinate_field(h_space))
+        @show ClimaComms.device(z_grid)
+        @show ClimaComms.device(z_surface)
+        @show ClimaComms.device(Geometry.ZPoint.(z_surface))
+        @show typeof(h_space)
+        @show typeof(z_grid)
+        @show typeof(z_surface)
     end
     grid = Grids.ExtrudedFiniteDifferenceGrid(h_grid, z_grid, hypsography; deep)
     # TODO: return the grid