Index: acquia_agent/acquia_agent.install
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/acquia_connector/acquia_agent/acquia_agent.install,v
retrieving revision 1.3
diff -u -p -r1.3 acquia_agent.install
--- acquia_agent/acquia_agent.install	20 Mar 2009 14:32:37 -0000	1.3
+++ acquia_agent/acquia_agent.install	23 Mar 2009 15:57:04 -0000
@@ -23,6 +23,16 @@ function acquia_agent_uninstall() {
 }
 
 /**
+ * Implementation of hook_disable().
+ */
+function acquia_agent_disable() {
+  $mlid = db_result(db_query("SELECT mlid FROM {menu_links} WHERE link_title = 'acquia_subscription_status' AND menu_name = 'admin_menu'"));
+  if ($mlid) {
+     menu_link_delete($mlid);
+  }
+}
+
+/**
  * Alter a list of module updates so that Acquia's updates run first.
  */
 function acquia_agent_alter_module_updates(&$updates) {
Index: acquia_agent/acquia_agent.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/acquia_connector/acquia_agent/acquia_agent.module,v
retrieving revision 1.14
diff -u -p -r1.14 acquia_agent.module
--- acquia_agent/acquia_agent.module	20 Mar 2009 17:52:34 -0000	1.14
+++ acquia_agent/acquia_agent.module	23 Mar 2009 15:57:04 -0000
@@ -307,14 +307,14 @@ function acquia_agent_translated_menu_li
     if ($subscription['active']) {
       $icon = '<img src="'. base_path() . 'misc/watchdog-ok.png" height="10" alt="ok" />';
       $item['title'] = t("!icon Subscription active (expires !date)", array('!icon' => $icon, '!date' => format_date(strtotime($subscription['expiration_date']['value']), 'small')));
-      $item['localized_options']['attributes']['class'] .= "acquia-active-subscription";
+      $item['localized_options']['extra class'] .= " acquia-active-subscription";
       $item['localized_options']['attributes']['title'] = $subscription['product']['view'];
       $item['href'] = $subscription['href'];
     }
     else {
       $icon = '<img src="'. base_path() . 'misc/watchdog-error.png" height="10" alt="error" />';
       $item['title'] = t("!icon Subscription not active", array('!icon' => $icon));
-      $item['localized_options']['attributes']['class'] .= "acquia-inactive-subscription";
+      $item['localized_options']['extra class'] .= " acquia-inactive-subscription";
       $item['href'] = 'http://acquia.com/network';
     }
   }
@@ -460,7 +460,7 @@ function acquia_agent_settings($variable
     case 'acquia_key':
       return variable_get('acquia_key', '');
     case 'acquia_network_address':
-      return variable_get('acquia_network_address', 'rpc.acquia.com');
+      return variable_get('acquia_network_address', 'https://rpc.acquia.com');
     case 'acquia_subscription_data':
       return variable_get('acquia_subscription_data', array('active' => FALSE));
   }
Index: acquia_agent/acquia_agent.pages.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/acquia_connector/acquia_agent/acquia_agent.pages.inc,v
retrieving revision 1.3
diff -u -p -r1.3 acquia_agent.pages.inc
--- acquia_agent/acquia_agent.pages.inc	20 Mar 2009 17:52:34 -0000	1.3
+++ acquia_agent/acquia_agent.pages.inc	23 Mar 2009 15:57:04 -0000
@@ -227,7 +227,7 @@ function acquia_agent_system_modules($fo
       $row[] = array('data' => $description, 'class' => 'description');
 
       // Add the extra info inline above the affected module row
-      if ($form['description'][$key]['#extra']) {
+      if (isset($form['description'][$key]['#extra'])) {
         $extra_row[] = array(
           'data' => $form['description'][$key]['#extra'],
           'colspan' => '4',