diff --git a/core/config.class.php b/core/config.class.php
index 285fb352..66d5d58a 100644
--- a/core/config.class.php
+++ b/core/config.class.php
@@ -211,7 +211,9 @@ class DatabaseConfig extends BaseConfig {
 			$this->database->Execute("DELETE FROM config WHERE name = :name", array("name"=>$name));
 			$this->database->Execute("INSERT INTO config VALUES (:name, :value)", array("name"=>$name, "value"=>$this->values[$name]));
 		}
-		$this->database->cache->delete("config");
+		// rather than deleting and having some other request(s) do a thundering
+		// herd of race-conditioned updates, just save the updated version once here
+		$this->database->cache->set("config", $this->values);
 	}
 }
 
diff --git a/ext/setup/main.php b/ext/setup/main.php
index 010b0807..e9fc3249 100644
--- a/ext/setup/main.php
+++ b/ext/setup/main.php
@@ -218,7 +218,7 @@ class Setup extends Extension {
 				$host .= ":" . $_SERVER["SERVER_PORT"];
 			}
 		}
-                $full = ($_SERVER["HTTPS"] ? "https://" : "http://") . $host . $_SERVER["PHP_SELF"];
+                $full = (@$_SERVER["HTTPS"] ? "https://" : "http://") . $host . $_SERVER["PHP_SELF"];
 		$test_url = str_replace("/index.php", "/nicetest", $full);
 
 		$nicescript = "<script language='javascript'>
diff --git a/ext/setup/theme.php b/ext/setup/theme.php
index c42442b4..6d67d1de 100644
--- a/ext/setup/theme.php
+++ b/ext/setup/theme.php
@@ -81,7 +81,7 @@ class SetupTheme extends Themelet {
 	protected function build_navigation() {
 		return "
 			<a href='".make_link()."'>Index</a>
-			<br><a href='http://redmine.shishnet.org/wiki/shimmie2/Settings'>Help</a>
+			<br><a href='https://github.com/shish/shimmie2/wiki/Settings'>Help</a>
 			<br><a href='".make_link("setup/advanced")."'>Advanced</a>
 		";
 	}