diff --git a/src/simulation/m_riemann_solvers.fpp b/src/simulation/m_riemann_solvers.fpp
index 33661b54d7..2c8f16a52c 100644
--- a/src/simulation/m_riemann_solvers.fpp
+++ b/src/simulation/m_riemann_solvers.fpp
@@ -908,7 +908,7 @@ contains
             & dqL_prim_dy_vf, dqL_prim_dz_vf, qR_prim_rsx_vf, qR_prim_rsy_vf, qR_prim_rsz_vf, dqR_prim_dx_vf, dqR_prim_dy_vf, &
             & dqR_prim_dz_vf, norm_dir, ix, iy, iz)
 
-        ! Reshaping inputted data based on dimensional splitting direction
+        ! Reshaping input data based on dimensional splitting direction
         call s_initialize_riemann_solver(flux_src_vf, norm_dir)
         #:for NORM_DIR, XYZ in [(1, 'x'), (2, 'y'), (3, 'z')]
             if (norm_dir == ${NORM_DIR}$) then
diff --git a/toolchain/modules b/toolchain/modules
index f76c1be1b9..33f79f2071 100644
--- a/toolchain/modules
+++ b/toolchain/modules
@@ -37,7 +37,7 @@ e-gpu CC=nvc CXX=nvc++ FC=nvfortran
 p     GT Phoenix
 p-all python/3.12.5
 p-cpu gcc/12.3.0 openmpi/4.1.5
-p-gpu python/3.12.5 nvhpc/24.5 hpcx/2.19-cuda cuda/12.1.1
+p-gpu python/3.12.5 nvhpc/25.5 cuda/12.1.1 openmpi
 p-gpu MFC_CUDA_CC=70,75,80,89,90 NVHPC_CUDA_HOME=$CUDA_HOME CC=nvc CXX=nvc++ FC=nvfortran
 p-gpu-unload xalt