diff --git a/firmware/blinky/Makefile b/firmware/blinky/Makefile
index 01ca290b..57f3e7a2 100644
--- a/firmware/blinky/Makefile
+++ b/firmware/blinky/Makefile
@@ -26,7 +26,10 @@ BINARY = blinky
 SRC = $(BINARY).c \
 	../common/hackrf_core.c \
 	../common/sgpio.c \
+	../common/rf_path.c \
 	../common/si5351c.c \
-	../common/max2837.c
+	../common/max2837.c \
+	../common/max5864.c \
+	../common/rffc5071.c
 
 include ../common/Makefile_inc.mk
diff --git a/firmware/mixertx/Makefile b/firmware/mixertx/Makefile
index 3c2ffc00..0f0ab0f0 100644
--- a/firmware/mixertx/Makefile
+++ b/firmware/mixertx/Makefile
@@ -4,9 +4,11 @@ BINARY = mixertx
 
 SRC = $(BINARY).c \
 	../common/hackrf_core.c \
+	../common/rf_path.c \
 	../common/sgpio.c \
 	../common/si5351c.c \
 	../common/max2837.c \
+	../common/max5864.c \
 	../common/rffc5071.c
 
 include ../common/Makefile_inc.mk
diff --git a/firmware/sgpio-rx/sgpio-rx.c b/firmware/sgpio-rx/sgpio-rx.c
index 823204b4..a5fb1e86 100644
--- a/firmware/sgpio-rx/sgpio-rx.c
+++ b/firmware/sgpio-rx/sgpio-rx.c
@@ -29,7 +29,8 @@
 #include <tuning.h>
 
 void tx_test() {
-	sgpio_configure(TRANSCEIVER_MODE_TX, false);
+	sgpio_set_slice_mode(false);
+	sgpio_configure(TRANSCEIVER_MODE_TX);
 	
 	// LSB goes out first, samples are 0x<Q1><I1><Q0><I0>
 	volatile uint32_t buffer[] = {
@@ -50,7 +51,8 @@ void tx_test() {
 }
 
 void rx_test() {
-	sgpio_configure(TRANSCEIVER_MODE_RX, false);
+	sgpio_set_slice_mode(false);
+	sgpio_configure(TRANSCEIVER_MODE_RX);
 
     volatile uint32_t buffer[4096];
     uint32_t i = 0;
@@ -86,7 +88,7 @@ void rx_test() {
 
 int main(void) {
 
-	const uint32_t freq = 2700000000U;
+	const uint64_t freq = 2700000000U;
 
 	pin_setup();
 	enable_1v8_power();
@@ -95,7 +97,7 @@ int main(void) {
     rf_path_init();
     rf_path_set_direction(RF_PATH_DIRECTION_RX);
 
-	set_freq(freq / 1000000, freq % 1000000);
+	set_freq(freq);
 
 	rx_test();
 	gpio_set(PORT_LED1_3, (PIN_LED2)); /* LED2 on */
diff --git a/firmware/sgpio/Makefile b/firmware/sgpio/Makefile
index 9f0303b7..d9651279 100644
--- a/firmware/sgpio/Makefile
+++ b/firmware/sgpio/Makefile
@@ -24,9 +24,11 @@ BINARY = sgpio_test
 
 SRC = $(BINARY).c \
 	../common/hackrf_core.c \
+	../common/rf_path.c \
 	../common/sgpio.c \
 	../common/si5351c.c \
 	../common/max2837.c \
-	../common/max5864.c
+	../common/max5864.c \
+	../common/rffc5071.c
 
 include ../common/Makefile_inc.mk
diff --git a/firmware/sgpio/sgpio_test.c b/firmware/sgpio/sgpio_test.c
index e298c93e..802129db 100644
--- a/firmware/sgpio/sgpio_test.c
+++ b/firmware/sgpio/sgpio_test.c
@@ -31,7 +31,8 @@
 #include <sgpio.h>
 
 void tx_test() {
-	sgpio_configure(TRANSCEIVER_MODE_TX, false);
+	sgpio_set_slice_mode(false);
+	sgpio_configure(TRANSCEIVER_MODE_TX);
 
 	// LSB goes out first, samples are 0x<Q1><I1><Q0><I0>
 	volatile uint32_t buffer[] = {
@@ -52,7 +53,8 @@ void tx_test() {
 }
 
 void rx_test() {
-	sgpio_configure(TRANSCEIVER_MODE_RX, false);
+	sgpio_set_slice_mode(false);
+	sgpio_configure(TRANSCEIVER_MODE_RX);
     
     volatile uint32_t buffer[4096];
     uint32_t i = 0;
diff --git a/firmware/simpletx/Makefile b/firmware/simpletx/Makefile
index ad3e171b..2cfc070d 100644
--- a/firmware/simpletx/Makefile
+++ b/firmware/simpletx/Makefile
@@ -4,8 +4,11 @@ BINARY = simpletx
 
 SRC = $(BINARY).c \
 	../common/hackrf_core.c \
+	../common/rf_path.c \
 	../common/sgpio.c \
 	../common/si5351c.c \
-	../common/max2837.c
+	../common/max2837.c \
+	../common/max5864.c \
+	../common/rffc5071.c
 
 include ../common/Makefile_inc.mk
diff --git a/firmware/startup/Makefile b/firmware/startup/Makefile
index ab4b43cc..0895e670 100644
--- a/firmware/startup/Makefile
+++ b/firmware/startup/Makefile
@@ -4,8 +4,11 @@ BINARY = startup
 
 SRC = $(BINARY).c \
 	../common/hackrf_core.c \
+	../common/rf_path.c \
 	../common/sgpio.c \
 	../common/si5351c.c \
-	../common/max2837.c
+	../common/max2837.c \
+	../common/max5864.c \
+	../common/rffc5071.c
 
 include ../common/Makefile_inc.mk
diff --git a/firmware/startup_systick/Makefile b/firmware/startup_systick/Makefile
index 9a8cd55a..e98f315c 100644
--- a/firmware/startup_systick/Makefile
+++ b/firmware/startup_systick/Makefile
@@ -4,8 +4,11 @@ BINARY = startup_systick
 
 SRC = $(BINARY).c \
 	../common/hackrf_core.c \
+	../common/rf_path.c \
 	../common/sgpio.c \
 	../common/si5351c.c \
-	../common/max2837.c
+	../common/max2837.c \
+	../common/max5864.c \
+	../common/rffc5071.c
 
 include ../common/Makefile_inc.mk
diff --git a/firmware/startup_systick_perfo/Makefile b/firmware/startup_systick_perfo/Makefile
index a1d0b116..9874184e 100644
--- a/firmware/startup_systick_perfo/Makefile
+++ b/firmware/startup_systick_perfo/Makefile
@@ -5,8 +5,11 @@ BINARY = startup_systick_perfo_SPIFI
 SRC = startup_systick.c \
 	perf_mips.c \
 	../common/hackrf_core.c \
+	../common/rf_path.c \
 	../common/sgpio.c \
 	../common/si5351c.c \
-	../common/max2837.c
+	../common/max2837.c \
+	../common/max5864.c \
+	../common/rffc5071.c
 
 include ../common/Makefile_inc.mk