diff --git a/CMakeLists.txt b/CMakeLists.txt
index 523638f04f..b0c54e0607 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -790,9 +790,7 @@ message("pika GIT_DATE = ${PIKA_GIT_DATE}")
 message("pika GIT_TAG = ${PIKA_GIT_TAG}")
 message("pika BUILD_DATE = ${PIKA_BUILD_DATE}")
 
-set(PIKA_BUILD_VERSION_CC ${CMAKE_BINARY_DIR}/pika_build_version.cc
-        src/pika_cache_load_thread.cc
-        )
+set(PIKA_BUILD_VERSION_CC ${CMAKE_BINARY_DIR}/pika_build_version.cc)
 message("PIKA_BUILD_VERSION_CC : " ${PIKA_BUILD_VERSION_CC})
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/build_version.cc.in ${PIKA_BUILD_VERSION_CC} @ONLY)
 
diff --git a/src/pika_conf.cc b/src/pika_conf.cc
index aac11c3871..b7bf82e647 100644
--- a/src/pika_conf.cc
+++ b/src/pika_conf.cc
@@ -451,7 +451,7 @@ int PikaConf::Load() {
   rate_limiter_auto_tuned_ = at == "yes" || at.empty();
   // if rate limiter autotune enable, `rate_limiter_bandwidth_` will still be respected as an upper-bound.
   if (rate_limiter_auto_tuned_) {
-    rate_limiter_bandwidth_ = 10 * 1024 * 1024 * 1024; // 10GB/s
+    rate_limiter_bandwidth_ = 10LL * 1024 * 1024 * 1024; // 10GB/s
   }
 
   // max_write_buffer_num
diff --git a/src/storage/include/storage/storage_define.h b/src/storage/include/storage/storage_define.h
index 59fa44c495..f1cb47d40e 100644
--- a/src/storage/include/storage/storage_define.h
+++ b/src/storage/include/storage/storage_define.h
@@ -78,6 +78,7 @@ inline char* EncodeUserKey(const Slice& user_key, char* dst_ptr, size_t nzero) {
   }
   if (pos != user_key.size()) {
     memcpy(dst_ptr, user_data + pos, user_key.size() - pos);
+    dst_ptr += user_key.size() - pos;
   }
 
   memcpy(dst_ptr, kEncodedKeyDelim, 2);