diff --git a/projects/clr/hipamd/src/hip_hcc_internal.h b/projects/clr/hipamd/src/hip_hcc_internal.h
index 3fd09630d9..69434a6327 100644
--- a/projects/clr/hipamd/src/hip_hcc_internal.h
+++ b/projects/clr/hipamd/src/hip_hcc_internal.h
@@ -248,8 +248,8 @@ static const DbName dbName [] =
 #if COMPILE_HIP_DB
 #define tprintf(trace_level, ...) {\
     if (HIP_DB & (1<<(trace_level))) {\
-        char msgStr[2000];\
-        snprintf(msgStr, 2000, __VA_ARGS__);\
+        char msgStr[1000];\
+        snprintf(msgStr, sizeof(msgStr), __VA_ARGS__);\
         fprintf (stderr, "  %ship-%s tid:%d:%s%s", dbName[trace_level]._color, dbName[trace_level]._shortName, tls_tidInfo.tid(), msgStr, KNRM); \
     }\
 }
@@ -269,7 +269,7 @@ extern uint64_t recordApiTrace(std::string *fullStr, const std::string &apiStr);
 
 #if COMPILE_HIP_ATP_MARKER || (COMPILE_HIP_TRACE_API & 0x1)
 #define API_TRACE(forceTrace, ...)\
-uint64_t hipApiStartTick;\
+uint64_t hipApiStartTick=0;\
 {\
     tls_tidInfo.incApiSeqNum();\
     if (forceTrace || (HIP_PROFILE_API || (COMPILE_HIP_DB && (HIP_TRACE_API & (1<<TRACE_ALL))))) {\
diff --git a/projects/clr/hipamd/src/hip_memory.cpp b/projects/clr/hipamd/src/hip_memory.cpp
index fb25101d7e..8ed5e600e2 100644
--- a/projects/clr/hipamd/src/hip_memory.cpp
+++ b/projects/clr/hipamd/src/hip_memory.cpp
@@ -1744,8 +1744,9 @@ hipError_t hipIpcGetMemHandle(hipIpcMemHandle_t* handle, void* devPtr){
         am_status_t status = hc::am_memtracker_getinfo( &amPointerInfo , devPtr );
         if (status == AM_SUCCESS) {
             psize = (size_t)amPointerInfo._sizeBytes;
-        } else
+        } else {
             hipStatus = hipErrorInvalidResourceHandle;
+        }
         ihipIpcMemHandle_t* iHandle = (ihipIpcMemHandle_t*) handle;
         // Save the size of the pointer to hipIpcMemHandle
         iHandle->psize = psize;