diff --git a/src/tamm/execution_context.cpp b/src/tamm/execution_context.cpp
index 3dcf87218..5dbd6f127 100644
--- a/src/tamm/execution_context.cpp
+++ b/src/tamm/execution_context.cpp
@@ -38,7 +38,7 @@ ExecutionContext::ExecutionContext(ProcGroup pg, DistributionKind default_dist_k
 #else
   ranks_pn_ = GA_Cluster_nprocs(GA_Cluster_proc_nodeid(pg.rank().value()));
 #endif
-  nnodes_  = pg.size().value() / ranks_pn_;
+  nnodes_ = pg.size().value() / ranks_pn_;
   tamm::getHardwareGPUCount(&gpus_pn_);
 
 #if defined(__APPLE__)
diff --git a/src/tamm/gpu_streams.hpp b/src/tamm/gpu_streams.hpp
index b753fba07..374c838ab 100644
--- a/src/tamm/gpu_streams.hpp
+++ b/src/tamm/gpu_streams.hpp
@@ -15,9 +15,9 @@
 #include <cuda_runtime_api.h>
 #include <nvml.h>
 #elif defined(USE_HIP)
-#include <rocm_smi/rocm_smi.h>
 #include <hip/hip_runtime.h>
 #include <rocblas/rocblas.h>
+#include <rocm_smi/rocm_smi.h>
 #elif defined(USE_DPCPP)
 #include "sycl_device.hpp"
 #include <oneapi/mkl/blas.hpp>