diff --git a/src/bin/network/ifconfig/MediaTypes.cpp b/src/bin/network/ifconfig/MediaTypes.cpp
index 19efc3ef45..5e7c6b8f64 100644
--- a/src/bin/network/ifconfig/MediaTypes.cpp
+++ b/src/bin/network/ifconfig/MediaTypes.cpp
@@ -12,6 +12,7 @@
 #include "MediaTypes.h"
 
 #include <net/if_media.h>
+#include <string.h>
 
 
 struct media_type {
diff --git a/src/preferences/network/InterfaceAddressView.cpp b/src/preferences/network/InterfaceAddressView.cpp
index 387dcb30e6..5584be11f0 100644
--- a/src/preferences/network/InterfaceAddressView.cpp
+++ b/src/preferences/network/InterfaceAddressView.cpp
@@ -223,12 +223,10 @@ InterfaceAddressView::_UpdateFields()
 	int32 index = fInterface.FindFirstAddress(fFamily);
 	if (index >= 0)
 		status = fInterface.GetAddressAt(index, address);
-	if (index < 0 || status != B_OK
-		|| address.Address().IsEmpty() && !autoConfigure) {
-		if (!autoConfigure) {
-			_SetModeField(kModeDisabled);
-			return;
-		}
+	if (!autoConfigure && (index < 0 || status != B_OK
+			|| address.Address().IsEmpty())) {
+		_SetModeField(kModeDisabled);
+		return;
 	}
 
 	if (autoConfigure)