diff --git a/source/lib/hal_mcu/hal_mcu.c b/source/lib/hal_mcu/hal_mcu.c
index b52d5af514a999281b7fdcec6975981b7c15efb1..43be34852b99b8fac3a81ed9ea65e4f3404701a7 100644
--- a/source/lib/hal_mcu/hal_mcu.c
+++ b/source/lib/hal_mcu/hal_mcu.c
@@ -255,7 +255,7 @@ void msp_setup(void) {
 
 	// Setup Watch dog timer for 0.5 second tick using 16MHz DCO on MSP430FR5994
     // WDT 0.5s @ 16mHz, SMCLK, interval timer
-	WDTCTL= WDTPW0 + WDTSSEL_0 + WDTTMSEL + WDTIS_2;
+	WDTCTL= WDTPW + WDTSSEL_0 + WDTTMSEL + WDTIS_2;
 	SFRIE1 |= WDTIE;                           // Enable WDT interrupt
 
   // Unlock the system.
diff --git a/source/lib/uart_drv/uart_drv.c b/source/lib/uart_drv/uart_drv.c
index fceb4be71c84ca1f8b1a7a113a629414a2276f50..ee2315e69fd1c3d22a9d31c34c1b35be15c24987 100644
--- a/source/lib/uart_drv/uart_drv.c
+++ b/source/lib/uart_drv/uart_drv.c
@@ -568,7 +568,7 @@ void __attribute__ ((interrupt(USCI_A1_VECTOR))) USCI_A1_ISR (void)
 			__bic_SR_register_on_exit(LPM3_bits);
 		}
 		break;
-	case UCIV__UCTXCFG:
+	case UCIV__UCTXIFG:
 		// check if there is more data to send
 		if(circ_buf_remainder(&uart_tx_buf) < uart_tx_buf.size_of_buffer) {
 			UCA1TXBUF = circ_buf_get_data(&uart_tx_buf);
diff --git a/source/lib/uart_drv/uart_drv.h b/source/lib/uart_drv/uart_drv.h
index a56952f0aa91741a78c6d524a06180d78c27d1fc..2a490c91ce714910af6a0e592faad9b9e837ee61 100644
--- a/source/lib/uart_drv/uart_drv.h
+++ b/source/lib/uart_drv/uart_drv.h
@@ -34,7 +34,7 @@
 #define F2_UART_INTF_USCIA0  0xA0
 #define F5_UART_INTF_USCIA0  0xA1
 #define F5_UART_INTF_USCIA1  0xA2
-#define FR5_UART_INTF_USCIA0 0xA3
+#define FR5x_UART_INTF_USCIA0 0xA3
 
 /********************************************************************************
 * Select which port will be used for interface to UART
@@ -111,6 +111,10 @@
 #define TX_ISR_OFF               12
 #define TX_ISR_ON                13
 
+// Buffer sizes
+#define UART_BUFF_SIZE 80
+#define TX_BUFF_SIZE   64
+#define RSSI_OFFSET    72
 
 /*
  *  macro function for entering critical section (basically saving the