diff --git a/.gitlab/ci/config/google_benchmarks.sh b/.gitlab/ci/config/google_benchmarks.sh
index 9866ed4c784ccb224b35f9aae70d5306fe68f58f..5e8aef5978cf3af2eb4682f0282c5d1e90679f5a 100755
--- a/.gitlab/ci/config/google_benchmarks.sh
+++ b/.gitlab/ci/config/google_benchmarks.sh
@@ -2,10 +2,10 @@
 
 set -xe
 
-readonly version="91ed7eea6856f8785139c58fbcc827e82579243c"
+readonly version="v1.6.1"
 readonly tarball="$version.tar.gz"
 readonly url="https://github.com/google/benchmark/archive/$tarball"
-readonly sha256sum="039054b7919b0af1082b121df35f4c24fccdd97f308e3dc28f36a0d3a3c64c69"
+readonly sha256sum="6132883bc8c9b0df5375b16ab520fac1a85dc9e4cf5be59480448ece74b278d4"
 readonly install_dir="$HOME/gbench"
 
 if ! [[ "$VTKM_SETTINGS" =~ "benchmarks" ]]; then
diff --git a/CMake/VTKmDeviceAdapters.cmake b/CMake/VTKmDeviceAdapters.cmake
index 006448e7270af8a7d7498e7db9bb019a5d010bc9..15895313e1682bbcbb2a48cb5fddaf50a1d1cf50 100644
--- a/CMake/VTKmDeviceAdapters.cmake
+++ b/CMake/VTKmDeviceAdapters.cmake
@@ -324,6 +324,7 @@ if(VTKm_ENABLE_KOKKOS AND NOT TARGET vtkm::kokkos)
     cmake_minimum_required(VERSION 3.18 FATAL_ERROR)
     enable_language(HIP)
     add_library(vtkm::kokkos_hip INTERFACE IMPORTED GLOBAL)
+    set_property(TARGET Kokkos::kokkoscore PROPERTY INTERFACE_COMPILE_DEFINITIONS "")
     set_property(TARGET Kokkos::kokkoscore PROPERTY INTERFACE_COMPILE_OPTIONS "")
     set_property(TARGET Kokkos::kokkoscore PROPERTY INTERFACE_LINK_OPTIONS "")
   endif()
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 006417dbe5c76bddcab47f9b3b1275567c6230b9..94f6b7661fe62f62d230f284e8abd0233b4dc718 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -168,6 +168,10 @@ upper right.
         destination.
       * The `gitlab-push` script also pushes the `master` branch to your
         fork in GitLab to keep it in sync with the upstream `master`.
+      * If you have created or modified Git-LFS files, you will need to
+        push them separately using `git lfs push --all origin`. You will
+        need developer access to the VTK-m repository do this. If you do
+        not have developer access, ask the VTK-m group for help.
 
     The output will include a link to the topic branch in your fork in
     GitLab and a link to a page for creating a Merge Request.
@@ -580,7 +584,7 @@ To find out if you have local commits on your master branch, check its
 status:
 
     $ git checkout master
-	$ git status
+    $ git status
 
 If status responds that your branch is up to date or that your branch is
 _behind_ the `origin/master` remote branch, then everything is fine. (If
@@ -595,7 +599,7 @@ branch.
 
         $ git branch my-topic
 
-	Of course, replace `my-topic` with something that better describes your
+    Of course, replace `my-topic` with something that better describes your
     changes.
 
 2.  Reset the local master branch to the remote master branch: