diff --git a/Kconfig b/Kconfig
index 43af214..fabf249 100644
--- a/Kconfig
+++ b/Kconfig
@@ -4,7 +4,7 @@ menu "Modules"
 rsource "Kconfig.defaults"
 
 config AUDIO_SYNC_TIMER_USES_RTC
-    bool
+    bool "Enables syncronization between the APP and NET core running SD"
     default !BT_LL_ACS_NRF53 && SOC_SERIES_NRF53X
     select NRFX_RTC0
     select NRFX_DPPI
diff --git a/boards/nrf5340_audio_dk_nrf5340_cpuapp.overlay b/boards/nrf5340_audio_dk_nrf5340_cpuapp.overlay
index 6411227..6eb152e 100644
--- a/boards/nrf5340_audio_dk_nrf5340_cpuapp.overlay
+++ b/boards/nrf5340_audio_dk_nrf5340_cpuapp.overlay
@@ -8,3 +8,11 @@
         };
     };
 };
+
+&uart0 {
+	compatible = "nordic,nrf-uarte";
+	current-speed = <1000000>;
+	status = "okay";
+	hw-flow-control;
+};
+
diff --git a/overlay-usb.conf b/overlay-usb.conf
index ba2f734..a1d1dc5 100644
--- a/overlay-usb.conf
+++ b/overlay-usb.conf
@@ -14,20 +14,6 @@ CONFIG_USB_DEVICE_INITIALIZE_AT_BOOT=n
 #CONFIG_IPC_SERVICE_BACKEND_RPMSG_WQ_STACK_SIZE=8192
 #CONFIG_HEAP_MEM_POOL_SIZE=8192
 
-# Enable ISO support
-CONFIG_BT_ISO_BROADCASTER=y
-CONFIG_BT_ISO_TX_BUF_COUNT=10
-CONFIG_BT_ISO_TX_MTU=251
-CONFIG_BT_ISO_RX_BUF_COUNT=10
-CONFIG_BT_ISO_RX_MTU=251
-
-# setup rpmsg/Bluetooth buffer
-CONFIG_BT_BUF_EVT_RX_COUNT=16
-CONFIG_BT_BUF_EVT_RX_SIZE=255
-CONFIG_BT_BUF_ACL_RX_SIZE=255
-CONFIG_BT_BUF_ACL_TX_SIZE=251
-CONFIG_BT_BUF_CMD_TX_SIZE=255
-
 #debug stuff
 #CONFIG_ASSERT=y
 
diff --git a/prj.conf b/prj.conf
index 759612b..66173f0 100644
--- a/prj.conf
+++ b/prj.conf
@@ -16,6 +16,22 @@ CONFIG_BT_MAX_CONN=16
 CONFIG_BT_TINYCRYPT_ECC=n
 CONFIG_BT_CTLR_DTM_HCI=y
 
+# Enable ISO support
+CONFIG_BT_ISO_PERIPHERAL=y
+CONFIG_BT_ISO_CENTRAL=y
+CONFIG_BT_ISO_BROADCASTER=y
+CONFIG_BT_ISO_TX_BUF_COUNT=10
+CONFIG_BT_ISO_TX_MTU=251
+CONFIG_BT_ISO_RX_BUF_COUNT=10
+CONFIG_BT_ISO_RX_MTU=251
+
+# setup rpmsg/Bluetooth buffer
+CONFIG_BT_BUF_EVT_RX_COUNT=16
+CONFIG_BT_BUF_EVT_RX_SIZE=255
+CONFIG_BT_BUF_ACL_RX_SIZE=255
+CONFIG_BT_BUF_ACL_TX_SIZE=251
+CONFIG_BT_BUF_CMD_TX_SIZE=255
+
 CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=512
 
 # Workaround: Unable to allocate command buffer when using K_NO_WAIT since
diff --git a/src/audio_sync_timer_rtc.c b/src/audio_sync_timer_rtc.c
index a3c3862..61a0abc 100644
--- a/src/audio_sync_timer_rtc.c
+++ b/src/audio_sync_timer_rtc.c
@@ -9,7 +9,6 @@
 #include <zephyr/kernel.h>
 #include <zephyr/init.h>
 #include <nrfx_dppi.h>
-#include <nrfx_i2s.h>
 #include <nrfx_ipc.h>
 #include <nrfx_rtc.h>
 #include <nrfx_timer.h>
diff --git a/src/main.c b/src/main.c
index 360f67c..b6c39e1 100644
--- a/src/main.c
+++ b/src/main.c
@@ -470,6 +470,7 @@ int main(void)
 		uart_irq_tx_enable(hci_uart_dev);
 		k_sleep( K_MSEC(100) );
 	}
+    return 0;
 #endif
 
     while (1) {
diff --git a/uart1.overlay b/uart1.overlay
index dd62084..7cc502b 100644
--- a/uart1.overlay
+++ b/uart1.overlay
@@ -4,6 +4,7 @@
 };
 
 &uart1 {
+    compatible = "nordic,nrf-uarte";
     status = "okay";
     current-speed = <1000000>;
     hw-flow-control;