diff --git a/Makefile b/Makefile
index c0764927..2153e61a 100644
--- a/Makefile
+++ b/Makefile
@@ -386,9 +386,10 @@ $(CACHE_DIR)/inputplumber.tar.gz: $(CACHE_DIR)/libiio $(CACHE_DIR)/libserialport
 		wget -O $@ https://github.com/ShadowBlip/InputPlumber/releases/download/$${IP_VERSION}/inputplumber.tar.gz
 
 
+LIBIIO_URL ?= https://mirror.rackspace.com/archlinux/extra/os/x86_64/libiio-0.25-3-x86_64.pkg.tar.zst
 $(CACHE_DIR)/libiio:
 	rm -rf $(CACHE_DIR)/libiio*
-	wget https://archlinux.org/packages/extra/x86_64/libiio/download/ \
+	wget $(LIBIIO_URL) \
 		-O $(CACHE_DIR)/libiio.tar.zst
 	zstd -d $(CACHE_DIR)/libiio.tar.zst
 	mkdir -p $(CACHE_DIR)/libiio
diff --git a/core/ui/common/osk/on_screen_keyboard.gd b/core/ui/common/osk/on_screen_keyboard.gd
index 0d26da6d..cfb54908 100644
--- a/core/ui/common/osk/on_screen_keyboard.gd
+++ b/core/ui/common/osk/on_screen_keyboard.gd
@@ -50,6 +50,7 @@ func populate_keyboard() -> void:
 	# Clear the current layout
 	for child in rows_container.get_children():
 		rows_container.remove_child(child)
+		child.queue_free()
 	
 	# Populate the keyboard keys based on the given layout
 	var idx := 0
diff --git a/core/ui/components/containers/overlay_container.gd b/core/ui/components/containers/overlay_container.gd
index f8a1c9e9..56b8af1e 100644
--- a/core/ui/components/containers/overlay_container.gd
+++ b/core/ui/components/containers/overlay_container.gd
@@ -39,6 +39,7 @@ func remove_overlay(overlay: OverlayProvider) -> void:
 		return
 	if overlay in get_children():
 		remove_child(overlay)
+		overlay.queue_free()
 	overlays.erase(overlay.provider_id)