diff --git a/node/Defaults.cpp b/node/Defaults.cpp
index 4cd7973c4..c235ef2ce 100644
--- a/node/Defaults.cpp
+++ b/node/Defaults.cpp
@@ -29,6 +29,8 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "../include/ZeroTierOne.h"
+
 #include "Constants.hpp"
 #include "Defaults.hpp"
 #include "Utils.hpp"
@@ -158,7 +160,7 @@ Defaults::Defaults() :
 	rootTopologyAuthorities(_mkRootTopologyAuth()),
 	updateAuthorities(_mkUpdateAuth()),
 	updateLatestNfoURL(_mkUpdateUrl()),
-	v4Broadcast(((uint32_t)0xffffffff),ZT_DEFAULT_UDP_PORT)
+	v4Broadcast(((uint32_t)0xffffffff),ZT1_DEFAULT_PORT)
 {
 }
 
diff --git a/node/NetworkConfig.cpp b/node/NetworkConfig.cpp
index 3aefba4ca..a034b15f9 100644
--- a/node/NetworkConfig.cpp
+++ b/node/NetworkConfig.cpp
@@ -144,12 +144,12 @@ void NetworkConfig::_fromDictionary(const Dictionary &d)
 	std::vector<std::string> ipAddrsSplit(Utils::split(ipAddrs.c_str(),",","",""));
 	for(std::vector<std::string>::const_iterator ipstr(ipAddrsSplit.begin());ipstr!=ipAddrsSplit.end();++ipstr) {
 		InetAddress addr(*ipstr);
-		switch(addr.type()) {
-			case InetAddress::TYPE_IPV4:
+		switch(addr.ss_family) {
+			case AF_INET:
 				if ((!addr.netmaskBits())||(addr.netmaskBits() > 32))
 					continue;
 				break;
-			case InetAddress::TYPE_IPV6:
+			case AF_INET6:
 				if ((!addr.netmaskBits())||(addr.netmaskBits() > 128))
 					continue;
 				break;
diff --git a/node/OutboundMulticast.cpp b/node/OutboundMulticast.cpp
index 7caa27a75..a939082c1 100644
--- a/node/OutboundMulticast.cpp
+++ b/node/OutboundMulticast.cpp
@@ -29,10 +29,9 @@
 #include "RuntimeEnvironment.hpp"
 #include "OutboundMulticast.hpp"
 #include "Switch.hpp"
-#include "NodeConfig.hpp"
 #include "Network.hpp"
 #include "CertificateOfMembership.hpp"
-#include "Utils.hpp"
+#include "Node.hpp"
 #include "Logger.hpp"
 
 namespace ZeroTier {
@@ -105,7 +104,7 @@ void OutboundMulticast::init(
 void OutboundMulticast::sendOnly(const RuntimeEnvironment *RR,const Address &toAddr)
 {
 	if (_haveCom) {
-		SharedPtr<Network> network(RR->nc->network(_nwid));
+		SharedPtr<Network> network(RR->node->network(_nwid));
 		if (network->peerNeedsOurMembershipCertificate(toAddr,RR->node->now())) {
 			_packetWithCom.newInitializationVector();
 			_packetWithCom.setDestination(toAddr);
diff --git a/objects.mk b/objects.mk
index 92714143c..00cb9a673 100644
--- a/objects.mk
+++ b/objects.mk
@@ -18,7 +18,6 @@ OBJS=\
 	node/Peer.o \
 	node/Poly1305.o \
 	node/Salsa20.o \
-	node/SoftwareUpdater.o \
 	node/SHA512.o \
 	node/Switch.o \
 	node/Topology.o \