diff --git a/flight/OpenPilot/System/pios_board_posix.c b/flight/OpenPilot/System/pios_board_posix.c
index 573291025..fa2cec9de 100644
--- a/flight/OpenPilot/System/pios_board_posix.c
+++ b/flight/OpenPilot/System/pios_board_posix.c
@@ -164,7 +164,7 @@ void PIOS_Board_Init(void) {
 		PIOS_Assert(tx_buffer);
 		if (PIOS_COM_Init(&pios_com_gps_id, &pios_udp_com_driver, pios_udp_gps_id,
 				  rx_buffer, PIOS_COM_GPS_RX_BUF_LEN,
-				  rx_buffer, PIOS_COM_GPS_RX_BUF_LEN)) {
+				  tx_buffer, PIOS_COM_GPS_RX_BUF_LEN)) {
 			PIOS_Assert(0);
 		}
 	}
diff --git a/flight/PiOS.posix/posix/pios_udp.c b/flight/PiOS.posix/posix/pios_udp.c
index 39077b455..f7f91f620 100644
--- a/flight/PiOS.posix/posix/pios_udp.c
+++ b/flight/PiOS.posix/posix/pios_udp.c
@@ -64,6 +64,7 @@ static pios_udp_dev * find_udp_dev_by_id (uint8_t udp)
 {
   if (udp >= pios_udp_num_devices) {
     /* Undefined UDP port for this board (see pios_board.c) */
+	PIOS_Assert(0);
     return NULL;
   }
 
@@ -154,6 +155,8 @@ int32_t PIOS_UDP_Init(uint32_t * udp_id, const struct pios_udp_cfg * cfg)
 
   printf("udp dev %i - socket %i opened - result %i\n",pios_udp_num_devices-1,udp_dev->socket,res);
 
+  *udp_id = pios_udp_num_devices-1;
+
   return res;
 }