diff --git a/make-mac.mk b/make-mac.mk
index e53212c0e..174216fb1 100644
--- a/make-mac.mk
+++ b/make-mac.mk
@@ -6,7 +6,7 @@ ifeq ($(origin CXX),default)
 endif
 
 INCLUDES=
-DEFS=-DZT_ENABLE_CLUSTER
+DEFS=
 LIBS=
 ARCH_FLAGS=-arch x86_64
 
diff --git a/node/Cluster.cpp b/node/Cluster.cpp
index 98b452654..8a942cb0a 100644
--- a/node/Cluster.cpp
+++ b/node/Cluster.cpp
@@ -195,8 +195,12 @@ void Cluster::handleIncomingStateMessage(const void *msg,unsigned int len)
 							const Address destinationAddress(reinterpret_cast<const char *>(packet) + 8,ZT_ADDRESS_LENGTH);
 							SharedPtr<Peer> destinationPeer(RR->topology->getPeer(destinationAddress));
 							if (destinationPeer) {
-								RemotePath *destinationPath = destinationPeer->send(RR,packet,packetLen,RR->node->now());
-								if ((destinationPath)&&(numRemotePeerPaths > 0)&&(packetLen >= 18)&&(reinterpret_cast<const unsigned char *>(packet)[ZT_PACKET_FRAGMENT_IDX_FRAGMENT_INDICATOR] == ZT_PACKET_FRAGMENT_INDICATOR)) {
+								if (
+								    (destinationPeer->send(RR,packet,packetLen,RR->node->now()))&&
+								    (numRemotePeerPaths > 0)&&
+								    (packetLen >= 18)&&
+								    (reinterpret_cast<const unsigned char *>(packet)[ZT_PACKET_FRAGMENT_IDX_FRAGMENT_INDICATOR] == ZT_PACKET_FRAGMENT_INDICATOR)
+								   ) {
 									// If remote peer paths were sent with this relayed packet, we do
 									// RENDEZVOUS. It's handled here for cluster-relayed packets since
 									// we don't have both Peer records so this is a different path.
diff --git a/node/Topology.cpp b/node/Topology.cpp
index 2b9733863..a35585582 100644
--- a/node/Topology.cpp
+++ b/node/Topology.cpp
@@ -183,7 +183,7 @@ Identity Topology::getIdentity(const Address &zta)
 	return _getIdentity(zta);
 }
 
-void saveIdentity(const Identity &id)
+void Topology::saveIdentity(const Identity &id)
 {
 	if (id) {
 		char p[128];