diff --git a/01_wait_forever/.vscode/settings.json b/01_wait_forever/.vscode/settings.json
index 0a8d7c09..292bf2a9 100644
--- a/01_wait_forever/.vscode/settings.json
+++ b/01_wait_forever/.vscode/settings.json
@@ -3,7 +3,8 @@
   "editor.rulers": [100],
   "rust-analyzer.cargo.target": "aarch64-unknown-none-softfloat",
   "rust-analyzer.cargo.features": ["bsp_rpi3"],
-  "rust-analyzer.checkOnSave.overrideCommand": ["make", "check"],
+  "rust-analyzer.checkOnSave.allTargets": false,
+  "rust-analyzer.checkOnSave.extraArgs": ["--lib", "--bins"],
   "rust-analyzer.lens.debug": false,
   "rust-analyzer.lens.run": false
 }
diff --git a/01_wait_forever/Makefile b/01_wait_forever/Makefile
index 15082c03..7699e5f4 100644
--- a/01_wait_forever/Makefile
+++ b/01_wait_forever/Makefile
@@ -190,8 +190,3 @@ nm: $(KERNEL_ELF)
 	$(call color_header, "Launching nm")
 	@$(DOCKER_TOOLS) $(NM_BINARY) --demangle --print-size $(KERNEL_ELF) | sort | rustfilt
 
-##------------------------------------------------------------------------------
-## Helper target for rust-analyzer
-##------------------------------------------------------------------------------
-check:
-	@RUSTFLAGS="$(RUSTFLAGS)" $(CHECK_CMD) --message-format=json
diff --git a/02_runtime_init/.vscode/settings.json b/02_runtime_init/.vscode/settings.json
index 0a8d7c09..292bf2a9 100644
--- a/02_runtime_init/.vscode/settings.json
+++ b/02_runtime_init/.vscode/settings.json
@@ -3,7 +3,8 @@
   "editor.rulers": [100],
   "rust-analyzer.cargo.target": "aarch64-unknown-none-softfloat",
   "rust-analyzer.cargo.features": ["bsp_rpi3"],
-  "rust-analyzer.checkOnSave.overrideCommand": ["make", "check"],
+  "rust-analyzer.checkOnSave.allTargets": false,
+  "rust-analyzer.checkOnSave.extraArgs": ["--lib", "--bins"],
   "rust-analyzer.lens.debug": false,
   "rust-analyzer.lens.run": false
 }
diff --git a/02_runtime_init/Makefile b/02_runtime_init/Makefile
index d44f07aa..0d877c15 100644
--- a/02_runtime_init/Makefile
+++ b/02_runtime_init/Makefile
@@ -192,8 +192,3 @@ nm: $(KERNEL_ELF)
 	$(call color_header, "Launching nm")
 	@$(DOCKER_TOOLS) $(NM_BINARY) --demangle --print-size $(KERNEL_ELF) | sort | rustfilt
 
-##------------------------------------------------------------------------------
-## Helper target for rust-analyzer
-##------------------------------------------------------------------------------
-check:
-	@RUSTFLAGS="$(RUSTFLAGS)" $(CHECK_CMD) --message-format=json
diff --git a/03_hacky_hello_world/.vscode/settings.json b/03_hacky_hello_world/.vscode/settings.json
index 0a8d7c09..292bf2a9 100644
--- a/03_hacky_hello_world/.vscode/settings.json
+++ b/03_hacky_hello_world/.vscode/settings.json
@@ -3,7 +3,8 @@
   "editor.rulers": [100],
   "rust-analyzer.cargo.target": "aarch64-unknown-none-softfloat",
   "rust-analyzer.cargo.features": ["bsp_rpi3"],
-  "rust-analyzer.checkOnSave.overrideCommand": ["make", "check"],
+  "rust-analyzer.checkOnSave.allTargets": false,
+  "rust-analyzer.checkOnSave.extraArgs": ["--lib", "--bins"],
   "rust-analyzer.lens.debug": false,
   "rust-analyzer.lens.run": false
 }
diff --git a/03_hacky_hello_world/Makefile b/03_hacky_hello_world/Makefile
index ac52002f..c3e75cce 100644
--- a/03_hacky_hello_world/Makefile
+++ b/03_hacky_hello_world/Makefile
@@ -195,12 +195,6 @@ nm: $(KERNEL_ELF)
 	$(call color_header, "Launching nm")
 	@$(DOCKER_TOOLS) $(NM_BINARY) --demangle --print-size $(KERNEL_ELF) | sort | rustfilt
 
-##------------------------------------------------------------------------------
-## Helper target for rust-analyzer
-##------------------------------------------------------------------------------
-check:
-	@RUSTFLAGS="$(RUSTFLAGS)" $(CHECK_CMD) --message-format=json
-
 
 
 ##--------------------------------------------------------------------------------------------------
diff --git a/03_hacky_hello_world/README.md b/03_hacky_hello_world/README.md
index a1f3e150..7263532c 100644
--- a/03_hacky_hello_world/README.md
+++ b/03_hacky_hello_world/README.md
@@ -94,11 +94,10 @@ diff -uNr 02_runtime_init/Makefile 03_hacky_hello_world/Makefile
 
 
 
-@@ -197,3 +200,28 @@
- ##------------------------------------------------------------------------------
- check:
- 	@RUSTFLAGS="$(RUSTFLAGS)" $(CHECK_CMD) --message-format=json
-+
+@@ -192,3 +195,27 @@
+ 	$(call color_header, "Launching nm")
+ 	@$(DOCKER_TOOLS) $(NM_BINARY) --demangle --print-size $(KERNEL_ELF) | sort | rustfilt
+
 +
 +
 +##--------------------------------------------------------------------------------------------------
diff --git a/04_safe_globals/.vscode/settings.json b/04_safe_globals/.vscode/settings.json
index 0a8d7c09..292bf2a9 100644
--- a/04_safe_globals/.vscode/settings.json
+++ b/04_safe_globals/.vscode/settings.json
@@ -3,7 +3,8 @@
   "editor.rulers": [100],
   "rust-analyzer.cargo.target": "aarch64-unknown-none-softfloat",
   "rust-analyzer.cargo.features": ["bsp_rpi3"],
-  "rust-analyzer.checkOnSave.overrideCommand": ["make", "check"],
+  "rust-analyzer.checkOnSave.allTargets": false,
+  "rust-analyzer.checkOnSave.extraArgs": ["--lib", "--bins"],
   "rust-analyzer.lens.debug": false,
   "rust-analyzer.lens.run": false
 }
diff --git a/04_safe_globals/Makefile b/04_safe_globals/Makefile
index ac52002f..c3e75cce 100644
--- a/04_safe_globals/Makefile
+++ b/04_safe_globals/Makefile
@@ -195,12 +195,6 @@ nm: $(KERNEL_ELF)
 	$(call color_header, "Launching nm")
 	@$(DOCKER_TOOLS) $(NM_BINARY) --demangle --print-size $(KERNEL_ELF) | sort | rustfilt
 
-##------------------------------------------------------------------------------
-## Helper target for rust-analyzer
-##------------------------------------------------------------------------------
-check:
-	@RUSTFLAGS="$(RUSTFLAGS)" $(CHECK_CMD) --message-format=json
-
 
 
 ##--------------------------------------------------------------------------------------------------
diff --git a/05_drivers_gpio_uart/.vscode/settings.json b/05_drivers_gpio_uart/.vscode/settings.json
index 0a8d7c09..292bf2a9 100644
--- a/05_drivers_gpio_uart/.vscode/settings.json
+++ b/05_drivers_gpio_uart/.vscode/settings.json
@@ -3,7 +3,8 @@
   "editor.rulers": [100],
   "rust-analyzer.cargo.target": "aarch64-unknown-none-softfloat",
   "rust-analyzer.cargo.features": ["bsp_rpi3"],
-  "rust-analyzer.checkOnSave.overrideCommand": ["make", "check"],
+  "rust-analyzer.checkOnSave.allTargets": false,
+  "rust-analyzer.checkOnSave.extraArgs": ["--lib", "--bins"],
   "rust-analyzer.lens.debug": false,
   "rust-analyzer.lens.run": false
 }
diff --git a/05_drivers_gpio_uart/Makefile b/05_drivers_gpio_uart/Makefile
index 193581e9..38afeef9 100644
--- a/05_drivers_gpio_uart/Makefile
+++ b/05_drivers_gpio_uart/Makefile
@@ -214,12 +214,6 @@ nm: $(KERNEL_ELF)
 	$(call color_header, "Launching nm")
 	@$(DOCKER_TOOLS) $(NM_BINARY) --demangle --print-size $(KERNEL_ELF) | sort | rustfilt
 
-##------------------------------------------------------------------------------
-## Helper target for rust-analyzer
-##------------------------------------------------------------------------------
-check:
-	@RUSTFLAGS="$(RUSTFLAGS)" $(CHECK_CMD) --message-format=json
-
 
 
 ##--------------------------------------------------------------------------------------------------
diff --git a/06_uart_chainloader/.vscode/settings.json b/06_uart_chainloader/.vscode/settings.json
index 0a8d7c09..292bf2a9 100644
--- a/06_uart_chainloader/.vscode/settings.json
+++ b/06_uart_chainloader/.vscode/settings.json
@@ -3,7 +3,8 @@
   "editor.rulers": [100],
   "rust-analyzer.cargo.target": "aarch64-unknown-none-softfloat",
   "rust-analyzer.cargo.features": ["bsp_rpi3"],
-  "rust-analyzer.checkOnSave.overrideCommand": ["make", "check"],
+  "rust-analyzer.checkOnSave.allTargets": false,
+  "rust-analyzer.checkOnSave.extraArgs": ["--lib", "--bins"],
   "rust-analyzer.lens.debug": false,
   "rust-analyzer.lens.run": false
 }
diff --git a/06_uart_chainloader/Makefile b/06_uart_chainloader/Makefile
index 5ae54175..3cde6041 100644
--- a/06_uart_chainloader/Makefile
+++ b/06_uart_chainloader/Makefile
@@ -220,12 +220,6 @@ nm: $(KERNEL_ELF)
 	$(call color_header, "Launching nm")
 	@$(DOCKER_TOOLS) $(NM_BINARY) --demangle --print-size $(KERNEL_ELF) | sort | rustfilt
 
-##------------------------------------------------------------------------------
-## Helper target for rust-analyzer
-##------------------------------------------------------------------------------
-check:
-	@RUSTFLAGS="$(RUSTFLAGS)" $(CHECK_CMD) --message-format=json
-
 
 
 ##--------------------------------------------------------------------------------------------------
diff --git a/06_uart_chainloader/README.md b/06_uart_chainloader/README.md
index 8c860316..04a21dff 100644
--- a/06_uart_chainloader/README.md
+++ b/06_uart_chainloader/README.md
@@ -248,7 +248,7 @@ diff -uNr 05_drivers_gpio_uart/Makefile 06_uart_chainloader/Makefile
 
  ##------------------------------------------------------------------------------
  ## Run clippy
-@@ -239,7 +245,8 @@
+@@ -233,7 +239,8 @@
  ##------------------------------------------------------------------------------
  test_boot: $(KERNEL_BIN)
  	$(call color_header, "Boot test - $(BSP)")
diff --git a/07_timestamps/.vscode/settings.json b/07_timestamps/.vscode/settings.json
index 0a8d7c09..292bf2a9 100644
--- a/07_timestamps/.vscode/settings.json
+++ b/07_timestamps/.vscode/settings.json
@@ -3,7 +3,8 @@
   "editor.rulers": [100],
   "rust-analyzer.cargo.target": "aarch64-unknown-none-softfloat",
   "rust-analyzer.cargo.features": ["bsp_rpi3"],
-  "rust-analyzer.checkOnSave.overrideCommand": ["make", "check"],
+  "rust-analyzer.checkOnSave.allTargets": false,
+  "rust-analyzer.checkOnSave.extraArgs": ["--lib", "--bins"],
   "rust-analyzer.lens.debug": false,
   "rust-analyzer.lens.run": false
 }
diff --git a/07_timestamps/Makefile b/07_timestamps/Makefile
index d127c422..d5395011 100644
--- a/07_timestamps/Makefile
+++ b/07_timestamps/Makefile
@@ -214,12 +214,6 @@ nm: $(KERNEL_ELF)
 	$(call color_header, "Launching nm")
 	@$(DOCKER_TOOLS) $(NM_BINARY) --demangle --print-size $(KERNEL_ELF) | sort | rustfilt
 
-##------------------------------------------------------------------------------
-## Helper target for rust-analyzer
-##------------------------------------------------------------------------------
-check:
-	@RUSTFLAGS="$(RUSTFLAGS)" $(CHECK_CMD) --message-format=json
-
 
 
 ##--------------------------------------------------------------------------------------------------
diff --git a/07_timestamps/README.md b/07_timestamps/README.md
index 6904f4f9..abdca348 100644
--- a/07_timestamps/README.md
+++ b/07_timestamps/README.md
@@ -149,7 +149,7 @@ diff -uNr 06_uart_chainloader/Makefile 07_timestamps/Makefile
 
  ##------------------------------------------------------------------------------
  ## Run clippy
-@@ -245,8 +239,7 @@
+@@ -239,8 +233,7 @@
  ##------------------------------------------------------------------------------
  test_boot: $(KERNEL_BIN)
  	$(call color_header, "Boot test - $(BSP)")
diff --git a/08_hw_debug_JTAG/.vscode/settings.json b/08_hw_debug_JTAG/.vscode/settings.json
index 0a8d7c09..292bf2a9 100644
--- a/08_hw_debug_JTAG/.vscode/settings.json
+++ b/08_hw_debug_JTAG/.vscode/settings.json
@@ -3,7 +3,8 @@
   "editor.rulers": [100],
   "rust-analyzer.cargo.target": "aarch64-unknown-none-softfloat",
   "rust-analyzer.cargo.features": ["bsp_rpi3"],
-  "rust-analyzer.checkOnSave.overrideCommand": ["make", "check"],
+  "rust-analyzer.checkOnSave.allTargets": false,
+  "rust-analyzer.checkOnSave.extraArgs": ["--lib", "--bins"],
   "rust-analyzer.lens.debug": false,
   "rust-analyzer.lens.run": false
 }
diff --git a/08_hw_debug_JTAG/Makefile b/08_hw_debug_JTAG/Makefile
index 1cf4d1aa..4f6b01f9 100644
--- a/08_hw_debug_JTAG/Makefile
+++ b/08_hw_debug_JTAG/Makefile
@@ -225,12 +225,6 @@ nm: $(KERNEL_ELF)
 	$(call color_header, "Launching nm")
 	@$(DOCKER_TOOLS) $(NM_BINARY) --demangle --print-size $(KERNEL_ELF) | sort | rustfilt
 
-##------------------------------------------------------------------------------
-## Helper target for rust-analyzer
-##------------------------------------------------------------------------------
-check:
-	@RUSTFLAGS="$(RUSTFLAGS)" $(CHECK_CMD) --message-format=json
-
 
 
 ##--------------------------------------------------------------------------------------------------
diff --git a/08_hw_debug_JTAG/README.md b/08_hw_debug_JTAG/README.md
index 902ca6e4..b1f5d679 100644
--- a/08_hw_debug_JTAG/README.md
+++ b/08_hw_debug_JTAG/README.md
@@ -364,7 +364,7 @@ diff -uNr 07_timestamps/Makefile 08_hw_debug_JTAG/Makefile
  endif
 
 
-@@ -222,6 +233,35 @@
+@@ -216,6 +227,35 @@
 
 
 
diff --git a/09_privilege_level/.vscode/settings.json b/09_privilege_level/.vscode/settings.json
index 0a8d7c09..292bf2a9 100644
--- a/09_privilege_level/.vscode/settings.json
+++ b/09_privilege_level/.vscode/settings.json
@@ -3,7 +3,8 @@
   "editor.rulers": [100],
   "rust-analyzer.cargo.target": "aarch64-unknown-none-softfloat",
   "rust-analyzer.cargo.features": ["bsp_rpi3"],
-  "rust-analyzer.checkOnSave.overrideCommand": ["make", "check"],
+  "rust-analyzer.checkOnSave.allTargets": false,
+  "rust-analyzer.checkOnSave.extraArgs": ["--lib", "--bins"],
   "rust-analyzer.lens.debug": false,
   "rust-analyzer.lens.run": false
 }
diff --git a/09_privilege_level/Makefile b/09_privilege_level/Makefile
index 1cf4d1aa..4f6b01f9 100644
--- a/09_privilege_level/Makefile
+++ b/09_privilege_level/Makefile
@@ -225,12 +225,6 @@ nm: $(KERNEL_ELF)
 	$(call color_header, "Launching nm")
 	@$(DOCKER_TOOLS) $(NM_BINARY) --demangle --print-size $(KERNEL_ELF) | sort | rustfilt
 
-##------------------------------------------------------------------------------
-## Helper target for rust-analyzer
-##------------------------------------------------------------------------------
-check:
-	@RUSTFLAGS="$(RUSTFLAGS)" $(CHECK_CMD) --message-format=json
-
 
 
 ##--------------------------------------------------------------------------------------------------
diff --git a/10_virtual_mem_part1_identity_mapping/.vscode/settings.json b/10_virtual_mem_part1_identity_mapping/.vscode/settings.json
index 0a8d7c09..292bf2a9 100644
--- a/10_virtual_mem_part1_identity_mapping/.vscode/settings.json
+++ b/10_virtual_mem_part1_identity_mapping/.vscode/settings.json
@@ -3,7 +3,8 @@
   "editor.rulers": [100],
   "rust-analyzer.cargo.target": "aarch64-unknown-none-softfloat",
   "rust-analyzer.cargo.features": ["bsp_rpi3"],
-  "rust-analyzer.checkOnSave.overrideCommand": ["make", "check"],
+  "rust-analyzer.checkOnSave.allTargets": false,
+  "rust-analyzer.checkOnSave.extraArgs": ["--lib", "--bins"],
   "rust-analyzer.lens.debug": false,
   "rust-analyzer.lens.run": false
 }
diff --git a/10_virtual_mem_part1_identity_mapping/Makefile b/10_virtual_mem_part1_identity_mapping/Makefile
index 1cf4d1aa..4f6b01f9 100644
--- a/10_virtual_mem_part1_identity_mapping/Makefile
+++ b/10_virtual_mem_part1_identity_mapping/Makefile
@@ -225,12 +225,6 @@ nm: $(KERNEL_ELF)
 	$(call color_header, "Launching nm")
 	@$(DOCKER_TOOLS) $(NM_BINARY) --demangle --print-size $(KERNEL_ELF) | sort | rustfilt
 
-##------------------------------------------------------------------------------
-## Helper target for rust-analyzer
-##------------------------------------------------------------------------------
-check:
-	@RUSTFLAGS="$(RUSTFLAGS)" $(CHECK_CMD) --message-format=json
-
 
 
 ##--------------------------------------------------------------------------------------------------
diff --git a/11_exceptions_part1_groundwork/.vscode/settings.json b/11_exceptions_part1_groundwork/.vscode/settings.json
index 0a8d7c09..292bf2a9 100644
--- a/11_exceptions_part1_groundwork/.vscode/settings.json
+++ b/11_exceptions_part1_groundwork/.vscode/settings.json
@@ -3,7 +3,8 @@
   "editor.rulers": [100],
   "rust-analyzer.cargo.target": "aarch64-unknown-none-softfloat",
   "rust-analyzer.cargo.features": ["bsp_rpi3"],
-  "rust-analyzer.checkOnSave.overrideCommand": ["make", "check"],
+  "rust-analyzer.checkOnSave.allTargets": false,
+  "rust-analyzer.checkOnSave.extraArgs": ["--lib", "--bins"],
   "rust-analyzer.lens.debug": false,
   "rust-analyzer.lens.run": false
 }
diff --git a/11_exceptions_part1_groundwork/Makefile b/11_exceptions_part1_groundwork/Makefile
index 1cf4d1aa..4f6b01f9 100644
--- a/11_exceptions_part1_groundwork/Makefile
+++ b/11_exceptions_part1_groundwork/Makefile
@@ -225,12 +225,6 @@ nm: $(KERNEL_ELF)
 	$(call color_header, "Launching nm")
 	@$(DOCKER_TOOLS) $(NM_BINARY) --demangle --print-size $(KERNEL_ELF) | sort | rustfilt
 
-##------------------------------------------------------------------------------
-## Helper target for rust-analyzer
-##------------------------------------------------------------------------------
-check:
-	@RUSTFLAGS="$(RUSTFLAGS)" $(CHECK_CMD) --message-format=json
-
 
 
 ##--------------------------------------------------------------------------------------------------
diff --git a/12_integrated_testing/.vscode/settings.json b/12_integrated_testing/.vscode/settings.json
index 0a8d7c09..292bf2a9 100644
--- a/12_integrated_testing/.vscode/settings.json
+++ b/12_integrated_testing/.vscode/settings.json
@@ -3,7 +3,8 @@
   "editor.rulers": [100],
   "rust-analyzer.cargo.target": "aarch64-unknown-none-softfloat",
   "rust-analyzer.cargo.features": ["bsp_rpi3"],
-  "rust-analyzer.checkOnSave.overrideCommand": ["make", "check"],
+  "rust-analyzer.checkOnSave.allTargets": false,
+  "rust-analyzer.checkOnSave.extraArgs": ["--lib", "--bins"],
   "rust-analyzer.lens.debug": false,
   "rust-analyzer.lens.run": false
 }
diff --git a/12_integrated_testing/Makefile b/12_integrated_testing/Makefile
index 427c9303..50986ce2 100644
--- a/12_integrated_testing/Makefile
+++ b/12_integrated_testing/Makefile
@@ -237,12 +237,6 @@ nm: $(KERNEL_ELF)
 	$(call color_header, "Launching nm")
 	@$(DOCKER_TOOLS) $(NM_BINARY) --demangle --print-size $(KERNEL_ELF) | sort | rustfilt
 
-##------------------------------------------------------------------------------
-## Helper target for rust-analyzer
-##------------------------------------------------------------------------------
-check:
-	@RUSTFLAGS="$(RUSTFLAGS)" $(CHECK_CMD) --message-format=json
-
 
 
 ##--------------------------------------------------------------------------------------------------
diff --git a/13_exceptions_part2_peripheral_IRQs/.vscode/settings.json b/13_exceptions_part2_peripheral_IRQs/.vscode/settings.json
index 0a8d7c09..292bf2a9 100644
--- a/13_exceptions_part2_peripheral_IRQs/.vscode/settings.json
+++ b/13_exceptions_part2_peripheral_IRQs/.vscode/settings.json
@@ -3,7 +3,8 @@
   "editor.rulers": [100],
   "rust-analyzer.cargo.target": "aarch64-unknown-none-softfloat",
   "rust-analyzer.cargo.features": ["bsp_rpi3"],
-  "rust-analyzer.checkOnSave.overrideCommand": ["make", "check"],
+  "rust-analyzer.checkOnSave.allTargets": false,
+  "rust-analyzer.checkOnSave.extraArgs": ["--lib", "--bins"],
   "rust-analyzer.lens.debug": false,
   "rust-analyzer.lens.run": false
 }
diff --git a/13_exceptions_part2_peripheral_IRQs/Makefile b/13_exceptions_part2_peripheral_IRQs/Makefile
index 427c9303..50986ce2 100644
--- a/13_exceptions_part2_peripheral_IRQs/Makefile
+++ b/13_exceptions_part2_peripheral_IRQs/Makefile
@@ -237,12 +237,6 @@ nm: $(KERNEL_ELF)
 	$(call color_header, "Launching nm")
 	@$(DOCKER_TOOLS) $(NM_BINARY) --demangle --print-size $(KERNEL_ELF) | sort | rustfilt
 
-##------------------------------------------------------------------------------
-## Helper target for rust-analyzer
-##------------------------------------------------------------------------------
-check:
-	@RUSTFLAGS="$(RUSTFLAGS)" $(CHECK_CMD) --message-format=json
-
 
 
 ##--------------------------------------------------------------------------------------------------
diff --git a/14_virtual_mem_part2_mmio_remap/.vscode/settings.json b/14_virtual_mem_part2_mmio_remap/.vscode/settings.json
index 0a8d7c09..292bf2a9 100644
--- a/14_virtual_mem_part2_mmio_remap/.vscode/settings.json
+++ b/14_virtual_mem_part2_mmio_remap/.vscode/settings.json
@@ -3,7 +3,8 @@
   "editor.rulers": [100],
   "rust-analyzer.cargo.target": "aarch64-unknown-none-softfloat",
   "rust-analyzer.cargo.features": ["bsp_rpi3"],
-  "rust-analyzer.checkOnSave.overrideCommand": ["make", "check"],
+  "rust-analyzer.checkOnSave.allTargets": false,
+  "rust-analyzer.checkOnSave.extraArgs": ["--lib", "--bins"],
   "rust-analyzer.lens.debug": false,
   "rust-analyzer.lens.run": false
 }
diff --git a/14_virtual_mem_part2_mmio_remap/Makefile b/14_virtual_mem_part2_mmio_remap/Makefile
index 427c9303..50986ce2 100644
--- a/14_virtual_mem_part2_mmio_remap/Makefile
+++ b/14_virtual_mem_part2_mmio_remap/Makefile
@@ -237,12 +237,6 @@ nm: $(KERNEL_ELF)
 	$(call color_header, "Launching nm")
 	@$(DOCKER_TOOLS) $(NM_BINARY) --demangle --print-size $(KERNEL_ELF) | sort | rustfilt
 
-##------------------------------------------------------------------------------
-## Helper target for rust-analyzer
-##------------------------------------------------------------------------------
-check:
-	@RUSTFLAGS="$(RUSTFLAGS)" $(CHECK_CMD) --message-format=json
-
 
 
 ##--------------------------------------------------------------------------------------------------
diff --git a/15_virtual_mem_part3_precomputed_tables/.vscode/settings.json b/15_virtual_mem_part3_precomputed_tables/.vscode/settings.json
index 0a8d7c09..292bf2a9 100644
--- a/15_virtual_mem_part3_precomputed_tables/.vscode/settings.json
+++ b/15_virtual_mem_part3_precomputed_tables/.vscode/settings.json
@@ -3,7 +3,8 @@
   "editor.rulers": [100],
   "rust-analyzer.cargo.target": "aarch64-unknown-none-softfloat",
   "rust-analyzer.cargo.features": ["bsp_rpi3"],
-  "rust-analyzer.checkOnSave.overrideCommand": ["make", "check"],
+  "rust-analyzer.checkOnSave.allTargets": false,
+  "rust-analyzer.checkOnSave.extraArgs": ["--lib", "--bins"],
   "rust-analyzer.lens.debug": false,
   "rust-analyzer.lens.run": false
 }
diff --git a/15_virtual_mem_part3_precomputed_tables/Makefile b/15_virtual_mem_part3_precomputed_tables/Makefile
index 81de6005..5c11f99e 100644
--- a/15_virtual_mem_part3_precomputed_tables/Makefile
+++ b/15_virtual_mem_part3_precomputed_tables/Makefile
@@ -253,12 +253,6 @@ nm: $(KERNEL_ELF)
 	$(call color_header, "Launching nm")
 	@$(DOCKER_TOOLS) $(NM_BINARY) --demangle --print-size $(KERNEL_ELF) | sort | rustfilt
 
-##------------------------------------------------------------------------------
-## Helper target for rust-analyzer
-##------------------------------------------------------------------------------
-check:
-	@RUSTFLAGS="$(RUSTFLAGS)" $(CHECK_CMD) --message-format=json
-
 
 
 ##--------------------------------------------------------------------------------------------------
diff --git a/15_virtual_mem_part3_precomputed_tables/README.md b/15_virtual_mem_part3_precomputed_tables/README.md
index 8cd644f4..9072bac4 100644
--- a/15_virtual_mem_part3_precomputed_tables/README.md
+++ b/15_virtual_mem_part3_precomputed_tables/README.md
@@ -1893,7 +1893,7 @@ diff -uNr 14_virtual_mem_part2_mmio_remap/Makefile 15_virtual_mem_part3_precompu
  	$(call color_progress_prefix, "Name")
  	@echo $(KERNEL_BIN)
  	$(call color_progress_prefix, "Size")
-@@ -308,6 +324,7 @@
+@@ -302,6 +318,7 @@
      TEST_ELF=$$(echo $$1 | sed -e 's/.*target/target/g')
      TEST_BINARY=$$(echo $$1.img | sed -e 's/.*target/target/g')
 
diff --git a/16_virtual_mem_part4_higher_half_kernel/.vscode/settings.json b/16_virtual_mem_part4_higher_half_kernel/.vscode/settings.json
index 0a8d7c09..292bf2a9 100644
--- a/16_virtual_mem_part4_higher_half_kernel/.vscode/settings.json
+++ b/16_virtual_mem_part4_higher_half_kernel/.vscode/settings.json
@@ -3,7 +3,8 @@
   "editor.rulers": [100],
   "rust-analyzer.cargo.target": "aarch64-unknown-none-softfloat",
   "rust-analyzer.cargo.features": ["bsp_rpi3"],
-  "rust-analyzer.checkOnSave.overrideCommand": ["make", "check"],
+  "rust-analyzer.checkOnSave.allTargets": false,
+  "rust-analyzer.checkOnSave.extraArgs": ["--lib", "--bins"],
   "rust-analyzer.lens.debug": false,
   "rust-analyzer.lens.run": false
 }
diff --git a/16_virtual_mem_part4_higher_half_kernel/Makefile b/16_virtual_mem_part4_higher_half_kernel/Makefile
index 81de6005..5c11f99e 100644
--- a/16_virtual_mem_part4_higher_half_kernel/Makefile
+++ b/16_virtual_mem_part4_higher_half_kernel/Makefile
@@ -253,12 +253,6 @@ nm: $(KERNEL_ELF)
 	$(call color_header, "Launching nm")
 	@$(DOCKER_TOOLS) $(NM_BINARY) --demangle --print-size $(KERNEL_ELF) | sort | rustfilt
 
-##------------------------------------------------------------------------------
-## Helper target for rust-analyzer
-##------------------------------------------------------------------------------
-check:
-	@RUSTFLAGS="$(RUSTFLAGS)" $(CHECK_CMD) --message-format=json
-
 
 
 ##--------------------------------------------------------------------------------------------------
diff --git a/X1_JTAG_boot/.vscode/settings.json b/X1_JTAG_boot/.vscode/settings.json
index 0a8d7c09..292bf2a9 100644
--- a/X1_JTAG_boot/.vscode/settings.json
+++ b/X1_JTAG_boot/.vscode/settings.json
@@ -3,7 +3,8 @@
   "editor.rulers": [100],
   "rust-analyzer.cargo.target": "aarch64-unknown-none-softfloat",
   "rust-analyzer.cargo.features": ["bsp_rpi3"],
-  "rust-analyzer.checkOnSave.overrideCommand": ["make", "check"],
+  "rust-analyzer.checkOnSave.allTargets": false,
+  "rust-analyzer.checkOnSave.extraArgs": ["--lib", "--bins"],
   "rust-analyzer.lens.debug": false,
   "rust-analyzer.lens.run": false
 }
diff --git a/X1_JTAG_boot/Makefile b/X1_JTAG_boot/Makefile
index d127c422..d5395011 100644
--- a/X1_JTAG_boot/Makefile
+++ b/X1_JTAG_boot/Makefile
@@ -214,12 +214,6 @@ nm: $(KERNEL_ELF)
 	$(call color_header, "Launching nm")
 	@$(DOCKER_TOOLS) $(NM_BINARY) --demangle --print-size $(KERNEL_ELF) | sort | rustfilt
 
-##------------------------------------------------------------------------------
-## Helper target for rust-analyzer
-##------------------------------------------------------------------------------
-check:
-	@RUSTFLAGS="$(RUSTFLAGS)" $(CHECK_CMD) --message-format=json
-
 
 
 ##--------------------------------------------------------------------------------------------------