diff --git a/include/ck/host_utility/device_prop.hpp b/include/ck/host_utility/device_prop.hpp
index 120b91b1f6..a0aa68b608 100644
--- a/include/ck/host_utility/device_prop.hpp
+++ b/include/ck/host_utility/device_prop.hpp
@@ -63,7 +63,7 @@ inline bool is_lds_direct_load_supported()
     // Check if direct loads from global memory to LDS are supported.
     return ck::get_device_name() == "gfx90a" || ck::get_device_name() == "gfx940" ||
            ck::get_device_name() == "gfx941" || ck::get_device_name() == "gfx942" ||
-	   ck::get_device_name() == "gfx950";
+           ck::get_device_name() == "gfx950";
 }
 
 inline bool is_navi1_supported()
diff --git a/include/ck/tensor_operation/gpu/device/impl/device_elementwise_3d_impl.hpp b/include/ck/tensor_operation/gpu/device/impl/device_elementwise_3d_impl.hpp
index 1238c6e704..be778b7137 100644
--- a/include/ck/tensor_operation/gpu/device/impl/device_elementwise_3d_impl.hpp
+++ b/include/ck/tensor_operation/gpu/device/impl/device_elementwise_3d_impl.hpp
@@ -294,7 +294,7 @@ struct DeviceElementwise3dImpl : public DeviceElementwise<InDataTypeTuple,
     bool IsSupportedArgument(const BaseArgument* p_arg) override
     {
         if((ck::get_device_name() == "gfx940" || ck::get_device_name() == "gfx941" ||
-            ck::get_device_name() == "gfx942" || ck::get_device_name() == "gfx950" ))
+            ck::get_device_name() == "gfx942" || ck::get_device_name() == "gfx950"))
         {
             return false;
         }
diff --git a/include/ck/utility/data_type.hpp b/include/ck/utility/data_type.hpp
index 31ae71880a..5827d4d3f3 100644
--- a/include/ck/utility/data_type.hpp
+++ b/include/ck/utility/data_type.hpp
@@ -189,7 +189,7 @@ struct vector_type<T, 1>
     }
 };
 
-int static err = 0;
+__device__ int static err = 0;
 template <typename T>
 struct vector_type<T, 2>
 {