Index: /trunk/src/VBox/NetworkServices/DHCP/Config.cpp
===================================================================
--- /trunk/src/VBox/NetworkServices/DHCP/Config.cpp	(revision 54695)
+++ /trunk/src/VBox/NetworkServices/DHCP/Config.cpp	(revision 54696)
@@ -219,5 +219,4 @@
     xml::NodesLoop leases(*root);
 
-    bool valueExists;
     const xml::ElementNode *lease;
     while ((lease = leases.forAllNodes()))
@@ -1406,26 +1405,36 @@
 bool Lease::toXML(xml::ElementNode *node) const
 {
-    bool valueAddition = node->setAttribute(tagXMLLeaseAttributeMac.c_str(), com::Utf8StrFmt("%RTmac", &m->m_mac));
-    if (!valueAddition) return false;
-
-    valueAddition = node->setAttribute(tagXMLLeaseAttributeNetwork.c_str(), com::Utf8StrFmt("%RTnaipv4", m->m_network));
-    if (!valueAddition) return false;
-
-    xml::ElementNode *address = node->createChild(tagXMLLeaseAddress.c_str());
-    if (!address) return false;
-
-    valueAddition = address->setAttribute(tagXMLAddressAttributeValue.c_str(), com::Utf8StrFmt("%RTnaipv4", m->m_address));
-    if (!valueAddition) return false;
-
-    xml::ElementNode *time = node->createChild(tagXMLLeaseTime.c_str());
-    if (!time) return false;
-
-    valueAddition = time->setAttribute(tagXMLTimeAttributeIssued.c_str(),
-                                       m->u64TimestampLeasingStarted);
-    if (!valueAddition) return false;
-
-    valueAddition = time->setAttribute(tagXMLTimeAttributeExpiration.c_str(),
-                                       m->u32LeaseExpirationPeriod);
-    if (!valueAddition) return false;
+    xml::AttributeNode *pAttribNode = node->setAttribute(tagXMLLeaseAttributeMac.c_str(),
+                                                         com::Utf8StrFmt("%RTmac", &m->m_mac));
+    if (!pAttribNode)
+        return false;
+
+    pAttribNode = node->setAttribute(tagXMLLeaseAttributeNetwork.c_str(),
+                                     com::Utf8StrFmt("%RTnaipv4", m->m_network));
+    if (!pAttribNode)
+        return false;
+
+    xml::ElementNode *pLeaseAddress = node->createChild(tagXMLLeaseAddress.c_str());
+    if (!pLeaseAddress)
+        return false;
+
+    pAttribNode = pLeaseAddress->setAttribute(tagXMLAddressAttributeValue.c_str(),
+                                              com::Utf8StrFmt("%RTnaipv4", m->m_address));
+    if (!pAttribNode)
+        return false;
+
+    xml::ElementNode *pLeaseTime = node->createChild(tagXMLLeaseTime.c_str());
+    if (!pLeaseTime)
+        return false;
+
+    pAttribNode = pLeaseTime->setAttribute(tagXMLTimeAttributeIssued.c_str(),
+                                           m->u64TimestampLeasingStarted);
+    if (!pAttribNode)
+        return false;
+
+    pAttribNode = pLeaseTime->setAttribute(tagXMLTimeAttributeExpiration.c_str(),
+                                           m->u32LeaseExpirationPeriod);
+    if (!pAttribNode)
+        return false;
 
     return true;
Index: /trunk/src/VBox/NetworkServices/NetLib/ComHostUtils.cpp
===================================================================
--- /trunk/src/VBox/NetworkServices/NetLib/ComHostUtils.cpp	(revision 54695)
+++ /trunk/src/VBox/NetworkServices/NetLib/ComHostUtils.cpp	(revision 54696)
@@ -79,10 +79,10 @@
 
     ComBstrArray strs;
-    int cStrs;
+    size_t cStrs;
     HRESULT hrc = nat->COMGETTER(LocalMappings)(ComSafeArrayAsOutParam(strs));
     if (   SUCCEEDED(hrc)
         && (cStrs = strs.size()))
     {
-        for (int i = 0; i < cStrs; ++i)
+        for (size_t i = 0; i < cStrs; ++i)
         {
             char szAddr[17];
Index: /trunk/src/VBox/NetworkServices/NetLib/utils.h
===================================================================
--- /trunk/src/VBox/NetworkServices/NetLib/utils.h	(revision 54695)
+++ /trunk/src/VBox/NetworkServices/NetLib/utils.h	(revision 54696)
@@ -40,5 +40,5 @@
         return false;
 
-    return fNeedDhcpServer;
+    return RT_BOOL(fNeedDhcpServer);
 }