diff --git a/cc65 b/cc65
index 79018fd42..65aad16d8 160000
--- a/cc65
+++ b/cc65
@@ -1 +1 @@
-Subproject commit 79018fd424bcf64533f82a19167f25b5fc02d1de
+Subproject commit 65aad16d8380901fe94bcfad4115f08ead609597
diff --git a/src/mega65-fdisk b/src/mega65-fdisk
index 07778d28a..7dd8c284a 160000
--- a/src/mega65-fdisk
+++ b/src/mega65-fdisk
@@ -1 +1 @@
-Subproject commit 07778d28a80927a3c2f3be571e7d5ba3f6846d67
+Subproject commit 7dd8c284ab663b9f91bce927c35268e1fe37447f
diff --git a/src/mega65-freezemenu b/src/mega65-freezemenu
index 47d5fd69a..01736cb77 160000
--- a/src/mega65-freezemenu
+++ b/src/mega65-freezemenu
@@ -1 +1 @@
-Subproject commit 47d5fd69aa0feb879f7be38136e56f21db9e80d0
+Subproject commit 01736cb774da78460b220b25ef735ca16eae34c2
diff --git a/src/mega65-libc b/src/mega65-libc
index f1e784b03..c390dac30 160000
--- a/src/mega65-libc
+++ b/src/mega65-libc
@@ -1 +1 @@
-Subproject commit f1e784b03b46fc37d5bf252fe053d123d879b222
+Subproject commit c390dac30d2b1cd740200246213d69179452d56b
diff --git a/src/vhdl/nexys4.vhdl b/src/vhdl/nexys4.vhdl
index 3397adce3..45973e4ff 100644
--- a/src/vhdl/nexys4.vhdl
+++ b/src/vhdl/nexys4.vhdl
@@ -581,8 +581,8 @@ begin
       uart_rx => jclo(1),
       uart_tx => jclo(2),
 
---      buffereduart_rx => jclo(3),
---      buffereduart_tx => jclo(4),
+      buffereduart_rx => jalo(1),
+      buffereduart_tx => jalo(2),
 --      buffereduart2_rx => jchi(9),
 --      buffereduart2_tx => jchi(10),
       buffereduart_ringindicate => (others => '0'),