diff --git a/build/debian/control b/build/debian/control
index 72441dbdb76..9b584478a49 100644
--- a/build/debian/control
+++ b/build/debian/control
@@ -29,6 +29,7 @@ Build-Depends: cmake,
                pkg-config,
                protobuf-compiler,
                rapidjson-dev,
+               systemtap-sdt-dev,
                uuid-dev,
 Standards-Version: 4.5.0
 
diff --git a/src/CMake/version.cmake b/src/CMake/version.cmake
index e818b2a9c60..77dd2893a7d 100644
--- a/src/CMake/version.cmake
+++ b/src/CMake/version.cmake
@@ -36,6 +36,11 @@ execute_process(
   OUTPUT_STRIP_TRAILING_WHITESPACE
 )
 
+#Set XRT_HEAD_COMMITS to default value if above command is not executed
+if (NOT XRT_HEAD_COMMITS)
+set (XRT_HEAD_COMMITS -1)
+endif()
+
 # Get number of commits between HEAD and master
 execute_process(
   COMMAND ${GIT_EXECUTABLE} rev-list --count HEAD ^origin/master
@@ -44,6 +49,11 @@ execute_process(
   OUTPUT_STRIP_TRAILING_WHITESPACE
 )
 
+#Set XRT_BRANCH_COMMITS to default value if above command is not executed
+if (NOT XRT_BRANCH_COMMITS)
+set (XRT_BRANCH_COMMITS -1)
+endif()
+
 # Get the latest abbreviated commit hash date of the working branch
 execute_process(
   COMMAND ${GIT_EXECUTABLE} log -1 --pretty=format:%cD
diff --git a/src/runtime_src/core/edge/drm/zocl/common/zocl_xclbin.c b/src/runtime_src/core/edge/drm/zocl/common/zocl_xclbin.c
index dbe63674c6a..6b661ba7df3 100644
--- a/src/runtime_src/core/edge/drm/zocl/common/zocl_xclbin.c
+++ b/src/runtime_src/core/edge/drm/zocl/common/zocl_xclbin.c
@@ -305,7 +305,7 @@ zocl_update_apertures(struct drm_zocl_dev *zdev, struct drm_zocl_slot *slot)
 	int i = 0;
         char kname[64] = {0};
         char *kname_p = NULL;
-      	struct kernel_info *krnl_info = NULL;
+        struct kernel_info *krnl_info = NULL;
 
 	/* Update aperture should only happen when loading xclbin */
 	if (slot->ip)
@@ -339,7 +339,7 @@ zocl_update_apertures(struct drm_zocl_dev *zdev, struct drm_zocl_slot *slot)
 			apt = &zdev->cu_subdev.apertures[apt_idx];
 
 			apt->addr = ip->m_base_address;
-                        
+
                         strncpy(kname, ip->m_name, sizeof(kname));
 		        kname[sizeof(kname)-1] = '\0';
 		        kname_p = &kname[0];
diff --git a/src/runtime_src/core/edge/user/aie/common_layer/adf_api_config.h b/src/runtime_src/core/edge/user/aie/common_layer/adf_api_config.h
index e4a9d2e77d0..603699791c4 100755
--- a/src/runtime_src/core/edge/user/aie/common_layer/adf_api_config.h
+++ b/src/runtime_src/core/edge/user/aie/common_layer/adf_api_config.h
@@ -16,6 +16,7 @@
 
 #pragma once
 
+#include <cstdint>
 #include <string>
 #include <vector>
 
diff --git a/src/runtime_src/core/edge/user/zynq_dev.h b/src/runtime_src/core/edge/user/zynq_dev.h
index 90d57b11c7e..9e9d3e5523d 100644
--- a/src/runtime_src/core/edge/user/zynq_dev.h
+++ b/src/runtime_src/core/edge/user/zynq_dev.h
@@ -17,6 +17,7 @@
 #ifndef _XCL_ZYNQ_DEV_H_
 #define _XCL_ZYNQ_DEV_H_
 
+#include <cstdint>
 #include <fstream>
 #include <string>
 #include <vector>