diff --git a/node/CertificateOfOwnership.hpp b/node/CertificateOfOwnership.hpp
index bae7ef2f2..fdffec3b8 100644
--- a/node/CertificateOfOwnership.hpp
+++ b/node/CertificateOfOwnership.hpp
@@ -67,29 +67,18 @@ public:
 		THING_IPV6_ADDRESS = 3
 	};
 
-	CertificateOfOwnership() :
-		_networkId(0),
-		_ts(0),
-		_flags(0),
-		_id(0),
-		_thingCount(0)
+	CertificateOfOwnership()
 	{
-		memset(_thingTypes,0,sizeof(_thingTypes));
-		memset(_thingValues,0,sizeof(_thingValues));
-		memset(_signature.data,0,sizeof(_signature.data));
+		memset(reinterpret_cast<void *>(this),0,sizeof(CertificateOfOwnership));
 	}
 
-	CertificateOfOwnership(const uint64_t nwid,const int64_t ts,const Address &issuedTo,const uint32_t id) :
-		_networkId(nwid),
-		_ts(ts),
-		_flags(0),
-		_id(id),
-		_thingCount(0),
-		_issuedTo(issuedTo)
+	CertificateOfOwnership(const uint64_t nwid,const int64_t ts,const Address &issuedTo,const uint32_t id)
 	{
-		memset(_thingTypes,0,sizeof(_thingTypes));
-		memset(_thingValues,0,sizeof(_thingValues));
-		memset(_signature.data,0,sizeof(_signature.data));
+		memset(reinterpret_cast<void *>(this),0,sizeof(CertificateOfOwnership));
+		_networkId = nwid;
+		_ts = ts;
+		_id = id;
+		_issuedTo = issuedTo;
 	}
 
 	inline uint64_t networkId() const { return _networkId; }
diff --git a/node/Network.cpp b/node/Network.cpp
index 9f78ec689..1e151b616 100644
--- a/node/Network.cpp
+++ b/node/Network.cpp
@@ -1036,7 +1036,7 @@ int Network::setConfiguration(void *tPtr,const NetworkConfig &nconf,bool saveToD
 		_portError = RR->node->configureVirtualNetworkPort(tPtr,_id,&_uPtr,(oldPortInitialized) ? ZT_VIRTUAL_NETWORK_CONFIG_OPERATION_CONFIG_UPDATE : ZT_VIRTUAL_NETWORK_CONFIG_OPERATION_UP,&ctmp);
 
 		if (saveToDisk) {
-			Dictionary<ZT_NETWORKCONFIG_DICT_CAPACITY> *d = new Dictionary<ZT_NETWORKCONFIG_DICT_CAPACITY>();
+			Dictionary<ZT_NETWORKCONFIG_DICT_CAPACITY> *const d = new Dictionary<ZT_NETWORKCONFIG_DICT_CAPACITY>();
 			try {
 				if (nconf.toDictionary(*d,false)) {
 					uint64_t tmp[2];