diff --git a/boot.php b/boot.php
index eda8a4037..c6f7b1e20 100644
--- a/boot.php
+++ b/boot.php
@@ -742,7 +742,7 @@ function run_update_function($x)
 		// delete the config entry to try again.
 
 		$t = Config::get('database', 'update_' . $x);
-		if ($t !== false) {
+		if (!is_null($t)) {
 			return false;
 		}
 		Config::set('database', 'update_' . $x, time());
diff --git a/include/nav.php b/include/nav.php
index f2bf161f9..58ec150e7 100644
--- a/include/nav.php
+++ b/include/nav.php
@@ -209,7 +209,7 @@ function nav_info(App $a)
 
 	// Provide a banner/logo/whatever
 	$banner = Config::get('system', 'banner');
-	if ($banner === false) {
+	if (is_null($banner)) {
 		$banner = '<a href="https://friendi.ca"><img id="logo-img" src="images/friendica-32.png" alt="logo" /></a><span id="logo-text"><a href="https://friendi.ca">Friendica</a></span>';
 	}
 
diff --git a/include/network.php b/include/network.php
index 52e340957..45f5d4e79 100644
--- a/include/network.php
+++ b/include/network.php
@@ -126,8 +126,8 @@ function z_fetch_url($url, $binary = false, &$redirects = 0, $opts = array())
 	if (x($opts, 'timeout')) {
 		@curl_setopt($ch, CURLOPT_TIMEOUT, $opts['timeout']);
 	} else {
-		$curl_time = intval(Config::get('system', 'curl_timeout'));
-		@curl_setopt($ch, CURLOPT_TIMEOUT, (($curl_time !== false) ? $curl_time : 60));
+		$curl_time = Config::get('system', 'curl_timeout', 60);
+		@curl_setopt($ch, CURLOPT_TIMEOUT, intval($curl_time));
 	}
 
 	// by default we will allow self-signed certs
@@ -302,8 +302,8 @@ function post_url($url, $params, $headers = null, &$redirects = 0, $timeout = 0)
 	if (intval($timeout)) {
 		curl_setopt($ch, CURLOPT_TIMEOUT, $timeout);
 	} else {
-		$curl_time = intval(Config::get('system', 'curl_timeout'));
-		curl_setopt($ch, CURLOPT_TIMEOUT, (($curl_time !== false) ? $curl_time : 60));
+		$curl_time = Config::get('system', 'curl_timeout', 60);
+		curl_setopt($ch, CURLOPT_TIMEOUT, intval($curl_time));
 	}
 
 	if (defined('LIGHTTPD')) {
diff --git a/src/Content/Feature.php b/src/Content/Feature.php
index 864c07a0d..c98a53c54 100644
--- a/src/Content/Feature.php
+++ b/src/Content/Feature.php
@@ -26,9 +26,11 @@ class Feature
 		if ($x === false) {
 			$x = PConfig::get($uid, 'feature', $feature, false);
 		}
+
 		if ($x === false) {
 			$x = Config::get('feature', $feature, false);
 		}
+
 		if ($x === false) {
 			$x = self::getDefault($feature);
 		}
diff --git a/src/Network/FKOAuthDataStore.php b/src/Network/FKOAuthDataStore.php
index 126f140bd..d7fa14518 100644
--- a/src/Network/FKOAuthDataStore.php
+++ b/src/Network/FKOAuthDataStore.php
@@ -171,7 +171,7 @@ class FKOAuthDataStore extends OAuthDataStore
 		dba::delete('tokens', array('id' => $token->key));
 
 
-		if (!is_null($ret) && $uverifier !== false) {
+		if (!is_null($ret) && !is_null($uverifier)) {
 			Config::delete("oauth", $verifier);
 		}
 
diff --git a/src/Worker/OnePoll.php b/src/Worker/OnePoll.php
index c1fb5350c..1190c77f5 100644
--- a/src/Worker/OnePoll.php
+++ b/src/Worker/OnePoll.php
@@ -91,8 +91,8 @@ Class OnePoll
 		$t = $contact['last-update'];
 
 		if ($contact['subhub']) {
-			$poll_interval = Config::get('system', 'pushpoll_frequency');
-			$contact['priority'] = (($poll_interval !== false) ? intval($poll_interval) : 3);
+			$poll_interval = Config::get('system', 'pushpoll_frequency', 3);
+			$contact['priority'] = intval($poll_interval);
 			$hub_update = false;
 
 			if (datetime_convert('UTC', 'UTC', 'now') > datetime_convert('UTC', 'UTC', $t . " + 1 day")) {
diff --git a/view/theme/vier/theme.php b/view/theme/vier/theme.php
index a8654f743..0f8120089 100644
--- a/view/theme/vier/theme.php
+++ b/view/theme/vier/theme.php
@@ -110,13 +110,13 @@ EOT;
 function get_vier_config($key, $default = false, $admin = false) {
 	if (local_user() && !$admin) {
 		$result = PConfig::get(local_user(), "vier", $key);
-		if ($result !== false) {
+		if (!is_null($result)) {
 			return $result;
 		}
 	}
 
 	$result = Config::get("vier", $key);
-	if ($result !== false) {
+	if (!is_null($result)) {
 		return $result;
 	}