diff --git a/.github/workflows/sanity_check.yml b/.github/workflows/sanity_check.yml
index 4b9f1be20255c8bda3cd98e7312578ff702e9a86..276851155844675cd21ab549beb43ad892b77155 100644
--- a/.github/workflows/sanity_check.yml
+++ b/.github/workflows/sanity_check.yml
@@ -32,7 +32,7 @@ jobs:
     - name: Download clang-format-diff.py
       uses: wei/wget@v1
       with:
-        args: https://raw.githubusercontent.com/llvm/llvm-project/master/clang/tools/clang-format/clang-format-diff.py
+        args: https://raw.githubusercontent.com/llvm/llvm-project/main/clang/tools/clang-format/clang-format-diff.py
 
     - name: Check format
       run: VERBOSE_CHECK=1 make check-format
diff --git a/Makefile b/Makefile
index 3a15364c30c3b89e149cd8f9e66ad9f2808f7824..fc249a717b5c5934421e12b7897b45138515031a 100644
--- a/Makefile
+++ b/Makefile
@@ -2514,6 +2514,8 @@ build_subset_tests: $(ROCKSDBTESTS_SUBSET)
 # working solution.
 ifneq ($(MAKECMDGOALS),clean)
 ifneq ($(MAKECMDGOALS),format)
+ifneq ($(MAKECMDGOALS),check-format)
+ifneq ($(MAKECMDGOALS),check-buck-targets)
 ifneq ($(MAKECMDGOALS),jclean)
 ifneq ($(MAKECMDGOALS),jtest)
 ifneq ($(MAKECMDGOALS),rocksdbjavastatic)
@@ -2529,3 +2531,5 @@ endif
 endif
 endif
 endif
+endif
+endif
diff --git a/build_tools/format-diff.sh b/build_tools/format-diff.sh
index ae037c7351a0ff46a4e7eb406296b4b5f6b074d9..9905a8baf45784d1696ef3af49072946c836a989 100755
--- a/build_tools/format-diff.sh
+++ b/build_tools/format-diff.sh
@@ -52,7 +52,7 @@ else
     else
       echo "You didn't have clang-format-diff.py and/or clang-format available in your computer!"
       echo "You can download clang-format-diff.py by running: "
-      echo "    curl --location https://tinyurl.com/y2kvokof -o ${REPO_ROOT}/clang-format-diff.py"
+      echo "    curl --location tinyurl.com/16e4xpg1 -o ${REPO_ROOT}/clang-format-diff.py"
       echo "You can download clang-format by running:"
       echo "    brew install clang-format"
       echo "  Or"
@@ -82,7 +82,7 @@ else
       echo "You have clang-format-diff.py for Python 2 but are using a Python 3"
       echo "interpreter (${PYTHON:-python3})."
       echo "You can download clang-format-diff.py for Python 3 by running: "
-      echo "    curl --location https://tinyurl.com/y2kvokof -o ${REPO_ROOT}/clang-format-diff.py"
+      echo "    curl --location tinyurl.com/16e4xpg1 -o ${REPO_ROOT}/clang-format-diff.py"
       exit 130
     fi
     CLANG_FORMAT_DIFF="${PYTHON:-python3} $CFD_PATH"