diff --git a/src/grid_launch.cpp b/src/grid_launch.cpp
index ffa50dec95..f3b28c5f60 100644
--- a/src/grid_launch.cpp
+++ b/src/grid_launch.cpp
@@ -54,7 +54,7 @@ namespace hip_impl
     {
         if ((HIP_TRACE_API & (1 << TRACE_KCMD)) ||
             HIP_PROFILE_API ||
-            (COMPILE_HIP_DB && HIP_TRACE_API)) {
+            (COMPILE_HIP_DB && (HIP_TRACE_API & (1<<TRACE_ALL)))) {
             std::stringstream os;
             os  << tls_tidInfo.tid() << "." << tls_tidInfo.apiSeqNum()
                 << " hipLaunchKernel '" << kernel_name << "'"
diff --git a/tests/src/test_common.h b/tests/src/test_common.h
index 1a6e51e08e..2c6905eea2 100644
--- a/tests/src/test_common.h
+++ b/tests/src/test_common.h
@@ -184,6 +184,7 @@ addCountReverse( const T *A_d,
 }
 
 
+template <typename T>
 void setDefaultData(size_t numElements, T *A_h, T* B_h, T *C_h)
 {
     // Initialize the host data: