diff --git a/eth_interface.h b/eth_interface.h
index 7620a37..dedd0f6 100644
--- a/eth_interface.h
+++ b/eth_interface.h
@@ -11,7 +11,7 @@ typedef struct {
     int (*llError)(int error); ///< Low-level error interrupt
 } EthIODef;
 
-typedef struct {
+typedef struct EthInterface_ {
     PcktSieve sieve; ///< Packet sieve
     EthIODef ioDef; ///< Low-level IO definitions
     EthernetAddress mac; ///< Ethernet address
diff --git a/prefab/conn_blocks/udp_connblock.c b/prefab/conn_blocks/udp_connblock.c
index 1ad997a..3781e4b 100644
--- a/prefab/conn_blocks/udp_connblock.c
+++ b/prefab/conn_blocks/udp_connblock.c
@@ -47,10 +47,11 @@ int udp_send(const struct ConnBlock_ * connBlock, const uint8_t *data, uint32_t
     ethHeader->prev = NULL;
 
     UdpProps * udpProps = HEADER_FETCH_PROPS(UdpProps, udpHeader);
-    IPv4Props * ipProps = HEADER_FETCH_PROPS(IPv4Props, udpHeader);
-    EthernetProps * ethProps = HEADER_FETCH_PROPS(EthernetProps, udpHeader);
+    IPv4Props * ipProps = HEADER_FETCH_PROPS(IPv4Props, ipHeader);
+    EthernetProps * ethProps = HEADER_FETCH_PROPS(EthernetProps, ethHeader);
 
     udpProps->Length = size;
 
+
     return 0;
 }