diff --git a/admin_autoupdate.php b/admin_autoupdate.php
index 5ba1daaa..4c034a62 100644
--- a/admin_autoupdate.php
+++ b/admin_autoupdate.php
@@ -62,7 +62,7 @@ if ($page == 'overview') {
 	if (is_array($latestversion) && count($latestversion) >= 1) {
 		$_version = $latestversion[0];
 		$_message = isset($latestversion[1]) ? $latestversion[1] : '';
-		$_link = isset($latestversion[2]) ? $latestversion[2] : htmlspecialchars($filename . '?s=' . urlencode($s) . '&page=' . urlencode($page) . '&lookfornewversion=yes');
+		$_link = isset($latestversion[2]) ? $latestversion[2] : htmlspecialchars($filename . '?page=' . urlencode($page) . '&lookfornewversion=yes');
 
 		// add the branding so debian guys are not gettings confused
 		// about their version-number
diff --git a/lib/Froxlor/Settings.php b/lib/Froxlor/Settings.php
index 17dd0c43..2d9b80c3 100644
--- a/lib/Froxlor/Settings.php
+++ b/lib/Froxlor/Settings.php
@@ -145,11 +145,11 @@ class Settings
 	public static function IsInList($setting = null, $entry = null)
 	{
 		self::init();
-		$s = self::Get($setting);
-		if ($s == null) {
+		$svalue = self::Get($setting);
+		if ($svalue == null) {
 			return false;
 		}
-		$slist = explode(",", $s);
+		$slist = explode(",", $svalue);
 		return in_array($entry, $slist);
 	}
 
diff --git a/lib/Froxlor/UI/Response.php b/lib/Froxlor/UI/Response.php
index 363e9c70..48e7bbe9 100644
--- a/lib/Froxlor/UI/Response.php
+++ b/lib/Froxlor/UI/Response.php
@@ -50,11 +50,7 @@ class Response
 			header('Location: ' . $linker->getLink());
 			exit();
 		} elseif ($get_variables == null) {
-			if ($isRelative) {
-				$linker = new Linker($destination, $s);
-			} else {
-				$linker = new Linker($destination);
-			}
+			$linker = new Linker($destination);
 			header('Location: ' . $linker->getLink());
 			exit();
 		}