diff --git a/html/includes/print-menubar.php b/html/includes/print-menubar.php
index 369e8172b..22e254be6 100644
--- a/html/includes/print-menubar.php
+++ b/html/includes/print-menubar.php
@@ -439,7 +439,7 @@ if ($_SESSION['userlevel'] >= '5' && ($routing_count['bgp']+$routing_count['ospf
 
   ## Do Alerts at the bottom
   if ($bgp_alerts)
-  { ## FIXME link below broken!
+  {
     echo('
         <li><hr width=140></li>
         <li><a href="routing/protocol=bgp/adminstatus=start/state=down/"><img src="images/16/link_error.png" border="0" align="absmiddle" /> Alerted BGP (' . $bgp_alerts . ')</a></li>
diff --git a/includes/sql-schema/update.php b/includes/sql-schema/update.php
index 20871c2d2..847797d6c 100644
--- a/includes/sql-schema/update.php
+++ b/includes/sql-schema/update.php
@@ -11,6 +11,24 @@
  * See COPYING for more details.
  */
 
+if (!isset($debug))
+{
+  # Not called from within discovery, let's load up the necessary stuff.
+
+  include("config.php");
+  include("includes/functions.php");
+
+  $options = getopt("d");
+  if (isset($options['d']))
+  {
+    $debug = TRUE;
+  }
+  else
+  {
+    $debug = FALSE;
+  }
+}
+
 if ($db_rev = @dbFetchCell("SELECT version FROM `dbSchema`")) {} else
 {
   $db_rev = 0;