diff --git a/projects/clr/hipamd/Jenkinsfile b/projects/clr/hipamd/Jenkinsfile
index 4909e666f0..6e5f7bc8e5 100644
--- a/projects/clr/hipamd/Jenkinsfile
+++ b/projects/clr/hipamd/Jenkinsfile
@@ -151,7 +151,7 @@ def docker_build_inside_image( def build_image, String inside_args, String platf
       // The rm command needs to run as sudo because the test steps below create files owned by root
       sh  """#!/usr/bin/env bash
           set -x
-          sudo rm -rf ${build_dir_rel}
+          rm -rf ${build_dir_rel}
           mkdir -p ${build_dir_rel}
           cd ${build_dir_rel}
           cmake -DCMAKE_BUILD_TYPE=${build_config} -DCMAKE_INSTALL_PREFIX=staging ${optional_configure} ${source_hip_abs}
@@ -160,6 +160,7 @@ def docker_build_inside_image( def build_image, String inside_args, String platf
     }
 
     // Cap the maximum amount of testing, in case of hangs
+    // Excluding hipPrintfKernel test from automation; variable fails on CI test machines
     timeout(time: 1, unit: 'HOURS')
     {
       stage("${platform} unit testing")
@@ -169,7 +170,7 @@ def docker_build_inside_image( def build_image, String inside_args, String platf
             cd ${build_dir_rel}
             make install -j\$(nproc)
             make build_tests -i -j\$(nproc)
-            make test
+            ctest -E hipPrintfKernel
           """
         // If unit tests output a junit or xunit file in the future, jenkins can parse that file
         // to display test results on the dashboard
@@ -193,7 +194,7 @@ def docker_build_inside_image( def build_image, String inside_args, String platf
         if( platform.toLowerCase( ).startsWith( 'hcc-ctu' ) )
         {
           archiveArtifacts artifacts: "${build_dir_rel}/*.deb", fingerprint: true
-          archiveArtifacts artifacts: "${build_dir_rel}/*.rpm", fingerprint: true
+          // archiveArtifacts artifacts: "${build_dir_rel}/*.rpm", fingerprint: true
         }
       }
     }
diff --git a/projects/clr/hipamd/include/hip/hcc_detail/code_object_bundle.hpp b/projects/clr/hipamd/include/hip/hcc_detail/code_object_bundle.hpp
index 72f9d35c73..2bec0017db 100644
--- a/projects/clr/hipamd/include/hip/hcc_detail/code_object_bundle.hpp
+++ b/projects/clr/hipamd/include/hip/hcc_detail/code_object_bundle.hpp
@@ -150,8 +150,8 @@ namespace hip_impl
     };
 
     // CREATORS
-    template<typename I>
-    Bundled_code_header::Bundled_code_header(I f, I l) : Bundled_code_header{}
+    template<typename RandomAccessIterator>
+    Bundled_code_header::Bundled_code_header(RandomAccessIterator f, RandomAccessIterator l) : Bundled_code_header{}
     {
         read(f, l, *this);
     }