diff --git a/coreapi/TunnelManager.cc b/coreapi/TunnelManager.cc
index 9b4cebda3..53d7f288f 100644
--- a/coreapi/TunnelManager.cc
+++ b/coreapi/TunnelManager.cc
@@ -388,7 +388,7 @@ bool TunnelManager::startAutoDetection() {
 bool TunnelManager::isActivated() const{
 	switch(getMode()){
 		case LinphoneTunnelModeAuto:
-			return !mState==disabled;
+			return !(mState==disabled);
 		case LinphoneTunnelModeDisable:
 			return false;
 		case LinphoneTunnelModeEnable:
diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c
index b434feebb..6a83183da 100644
--- a/coreapi/linphonecore.c
+++ b/coreapi/linphonecore.c
@@ -4940,11 +4940,11 @@ void linphone_core_set_firewall_policy(LinphoneCore *lc, LinphoneFirewallPolicy
 		lp_config_set_string(lc->config,"net","firewall_policy",policy);
 }
 
-ORTP_INLINE LinphoneFirewallPolicy linphone_core_get_firewall_policy(const LinphoneCore *lc) {
+LinphoneFirewallPolicy linphone_core_get_firewall_policy(const LinphoneCore *lc) {
 	return _linphone_core_get_firewall_policy_with_lie(lc, FALSE);
 }
 
-ORTP_INLINE LinphoneFirewallPolicy _linphone_core_get_firewall_policy(const LinphoneCore *lc) {
+LinphoneFirewallPolicy _linphone_core_get_firewall_policy(const LinphoneCore *lc) {
 	return _linphone_core_get_firewall_policy_with_lie(lc, TRUE);
 }