diff --git a/projects/hip/.clang-format b/projects/hip/.clang-format
new file mode 100644
index 0000000000..1793af2ba2
--- /dev/null
+++ b/projects/hip/.clang-format
@@ -0,0 +1,20 @@
+---
+Language: Cpp
+BasedOnStyle: Google
+AlignEscapedNewlinesLeft: false
+ColumnLimit: 100
+DerivePointerAlignment: false
+IndentWrappedFunctionNames: false
+MaxEmptyLinesToKeep: 2
+SortIncludes: false
+IndentWidth: 4
+---
+Language: ObjC
+BasedOnStyle: Google
+AlignEscapedNewlinesLeft: false
+ColumnLimit: 100
+DerivePointerAlignment: false
+IndentWrappedFunctionNames: false
+MaxEmptyLinesToKeep: 2
+SortIncludes: false
+IndentWidth: 4
diff --git a/projects/hip/CMakeLists.txt b/projects/hip/CMakeLists.txt
index 72cf10235b..7b9aad9c3c 100644
--- a/projects/hip/CMakeLists.txt
+++ b/projects/hip/CMakeLists.txt
@@ -227,8 +227,11 @@ endif()
 file(WRITE "${PROJECT_BINARY_DIR}/.hipVersion" ${_versionInfo})
 
 # Build doxygen documentation
-add_custom_target(doc COMMAND HIP_PATH=${CMAKE_CURRENT_SOURCE_DIR} doxygen ${CMAKE_CURRENT_SOURCE_DIR}/docs/doxygen-input/doxy.cfg
-    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/docs)
+find_program(DOXYGEN_EXE doxygen)
+if(DOXYGEN_EXE)
+    add_custom_target(doc COMMAND HIP_PATH=${CMAKE_CURRENT_SOURCE_DIR} ${DOXYGEN_EXE} ${CMAKE_CURRENT_SOURCE_DIR}/docs/doxygen-input/doxy.cfg
+        WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/docs)
+endif()
 
 #############################
 # Install steps
@@ -371,8 +374,23 @@ endif()
 #############################
 # Code analysis
 #############################
-# Target: static_check
-add_custom_target(static_check COMMAND cppcheck --force --quiet --enable=warning,performance,portability,information,missingInclude src include -I /opt/rocm/include/hcc -I /opt/rocm/include --suppress=*:/opt/rocm/include/hcc/hc.hpp WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
+# Target: cppcheck
+find_program(CPPCHECK_EXE cppcheck)
+if(CPPCHECK_EXE)
+    add_custom_target(cppcheck COMMAND ${CPPCHECK_EXE} --force --quiet --enable=warning,performance,portability,information,missingInclude src include -I /opt/rocm/include/hcc -I /opt/rocm/include --suppress=*:/opt/rocm/include/hcc/hc.hpp
+        WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
+endif()
+
+#############################
+# Code formatting
+#############################
+# Target: clangformat
+find_program(CLANGFORMAT_EXE clang-format PATHS ${HCC_HOME}/bin)
+if(CLANGFORMAT_EXE)
+    file(GLOB_RECURSE FORMAT_SOURCE_FILE_LIST *.cpp *.hpp *.h)
+    add_custom_target(clangformat COMMAND ${CLANGFORMAT_EXE} -style=file -i ${FORMAT_SOURCE_FILE_LIST}
+        WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
+endif()
 
 #############################
 # Testing steps
diff --git a/projects/hip/src/program_state.cpp b/projects/hip/src/program_state.cpp
index 6c973b00ec..41885946f8 100644
--- a/projects/hip/src/program_state.cpp
+++ b/projects/hip/src/program_state.cpp
@@ -472,4 +472,16 @@ namespace hip_impl
 
         return executable;
     }
+
+    // To force HIP to load the kernels and to setup the function
+    // symbol map on program startup
+    class startup_kernel_loader {
+      private:
+        startup_kernel_loader() { functions(); }
+        startup_kernel_loader(const startup_kernel_loader&) = delete;
+        startup_kernel_loader& operator= (const startup_kernel_loader&) = delete;
+        static startup_kernel_loader skl;
+    };
+    startup_kernel_loader startup_kernel_loader::skl;
+
 } // Namespace hip_impl.
diff --git a/projects/hip/tests/src/p2p/hipPeerToPeer_simple.cpp b/projects/hip/tests/src/p2p/hipPeerToPeer_simple.cpp
index c279658b5a..78f8de48a1 100644
--- a/projects/hip/tests/src/p2p/hipPeerToPeer_simple.cpp
+++ b/projects/hip/tests/src/p2p/hipPeerToPeer_simple.cpp
@@ -24,9 +24,9 @@ THE SOFTWARE.
 
 /* HIT_START
  * BUILD: %t %s ../test_common.cpp
- * RUN: %t EXCLUDE_HIP_PLATFORM all
- * RUN: %t --memcpyWithPeer EXCLUDE_HIP_PLATFORM all
- * RUN: %t --mirrorPeers EXCLUDE_HIP_PLATFORM all
+ * RUN: %t EXCLUDE_HIP_PLATFORM hcc 
+ * RUN: %t --memcpyWithPeer EXCLUDE_HIP_PLATFORM hcc
+ * RUN: %t --mirrorPeers EXCLUDE_HIP_PLATFORM hcc
  * HIT_END
  */