diff --git a/src/rational.h b/src/rational.h
index 45fdefe066a4104f732158f1142729b1b593a9fc..681f8fc4f4704c41a688867c84a2ca4bc4ecdb6b 100644
--- a/src/rational.h
+++ b/src/rational.h
@@ -31,6 +31,8 @@
 
 #pragma once
 
+#include <cstdlib> // std::abs
+
 namespace ring {
 
 /**
diff --git a/src/ringdht/ringaccount.cpp b/src/ringdht/ringaccount.cpp
index 299a1f6ad466f1e6aab548b2b8e223878f38342f..2f0518facf0c334c3861e412ebf5d3daada56121 100644
--- a/src/ringdht/ringaccount.cpp
+++ b/src/ringdht/ringaccount.cpp
@@ -81,7 +81,7 @@ static constexpr int ICE_INIT_TIMEOUT {5};
 static constexpr int ICE_NEGOTIATION_TIMEOUT {60};
 
 constexpr const char * const RingAccount::ACCOUNT_TYPE;
-constexpr const std::pair<uint16_t, uint16_t> RingAccount::DHT_PORT_RANGE;
+/* constexpr */ const std::pair<uint16_t, uint16_t> RingAccount::DHT_PORT_RANGE {4000, 8888};
 
 RingAccount::RingAccount(const std::string& accountID, bool /* presenceEnabled */)
     : SIPAccountBase(accountID), via_addr_()
diff --git a/src/ringdht/ringaccount.h b/src/ringdht/ringaccount.h
index 853ee19c421d2618f30967ed4f388789bedcea4a..858a37a9ab3e883837cf61225a489836c5620bc7 100644
--- a/src/ringdht/ringaccount.h
+++ b/src/ringdht/ringaccount.h
@@ -79,7 +79,7 @@ class RingAccount : public SIPAccountBase {
         constexpr static const char * const ACCOUNT_TYPE = "RING";
         constexpr static const in_port_t DHT_DEFAULT_PORT = 4222;
         constexpr static const char * const DHT_DEFAULT_BOOTSTRAP = "bootstrap.ring.cx";
-        constexpr static const std::pair<uint16_t, uint16_t> DHT_PORT_RANGE {4000, 8888};
+        /* constexpr */ static const std::pair<uint16_t, uint16_t> DHT_PORT_RANGE;
 
         const char* getAccountType() const {
             return ACCOUNT_TYPE;
diff --git a/src/sip/sipaccountbase.cpp b/src/sip/sipaccountbase.cpp
index 7302913c271bc0cd7116a7774f77b503d857880e..c94874da2e87024c85676b5aa3fb459506c9c848 100644
--- a/src/sip/sipaccountbase.cpp
+++ b/src/sip/sipaccountbase.cpp
@@ -276,6 +276,7 @@ uint16_t
 SIPAccountBase::acquirePort(uint16_t port)
 {
     getPortsReservation()[port / 2] = true;
+    return port;
 }
 
 void