diff -uprN -x CVS facebook_status-DRUPAL-6--3/facebook_status.install facebook_status/facebook_status.install
--- facebook_status-DRUPAL-6--3/facebook_status.install	2011-02-11 00:29:33.000000000 +0000
+++ facebook_status/facebook_status.install	2011-02-11 07:29:52.000000000 +0000
@@ -134,6 +134,48 @@ function facebook_status_update_6300() {
   variable_del('facebook_status_size');
   variable_del('facebook_status_type');
 
+  // Update tokens used in Pathauto.
+  $old = array(
+    '[owner]',
+    '[owner-name]',
+    '[owner-name-raw]',
+    '[owner-id]',
+    '[poster]',
+    '[poster-name]',
+    '[poster-name-raw]',
+    '[poster-id]',
+    '[status-unformatted]',
+    '[status-formatted]',
+    '[status-raw]',
+    '[status-themed]',
+    '[status-id]',
+    '[status-edit]',
+    '[status-delete]',
+    '[status-time]',
+  );
+  $new = array(
+    '[sender-themed]',
+    '[sender-name]',
+    '[sender-name-raw]',
+    '[sender-uid]',
+    '[recipient-link]',
+    '[recipient-name]',
+    '[recipient-name-raw]',
+    '[recipient-id]',
+    '[message-unformatted]',
+    '[message-formatted]',
+    '[message-raw]',
+    '[status-themed]',
+    '[status-id]',
+    '[status-edit]',
+    '[status-delete]',
+    '[created]',
+  );
+  $result = db_query("SELECT name FROM {variable} WHERE name LIKE 'pathauto_facebook_status_%'");
+  while ($variable = db_fetch_object($result)) { 
+    _facebook_status_update_tokens($variable, $old, $new); 
+  }
+
   // Drop current indexes.
   db_drop_index($ret, 'facebook_status', 'uid');
   db_drop_index($ret, 'facebook_status', 'pid');
@@ -207,3 +249,18 @@ function facebook_status_uninstall() {
   variable_del('facebook_status_nl2br');
   variable_del('facebook_status_ahah');
 }
+
+/**
+ * Helper function to update tokens.
+ * Shamelessly ripped off verbatim from invite.install:
+ * http://drupalcode.org/viewvc/drupal/contributions/modules/invite/invite.install?revision=1.16&view=markup
+ */
+function _facebook_status_update_tokens($variables, $old, $new) {
+  foreach ((array) $variables as $variable) {
+    if ($value = variable_get($variable, NULL)) {
+      $value = str_replace($old, $new, $value);
+      variable_set($variable, $value);
+    }
+  }
+}
+
diff -uprN -x CVS facebook_status-DRUPAL-6--3/facebook_status.module facebook_status/facebook_status.module
--- facebook_status-DRUPAL-6--3/facebook_status.module	2011-02-07 07:56:50.000000000 +0000
+++ facebook_status/facebook_status.module	2011-02-11 06:27:10.000000000 +0000
@@ -960,10 +960,10 @@ function facebook_status_token_list($typ
       'status-delete' => t('Delete status link.'),
       'created' => t('The themed time the status was submitted.'),
     );
-    if (module_exists('fbssc')) {
+    if (module_exists('fbss_comments')) {
       $tokens['facebook_status']['status-comment-count'] = t('The number of comments on the status.');
     }
-    $tokens['facebook_status'] += token_get_date_token_info(t('The status created'), 'status-time-');
+    $tokens['facebook_status'] += token_get_date_token_info(t('The status created'), 'created-');
     return $tokens;
   }
 }
diff -uprN -x CVS facebook_status-DRUPAL-6--3/submodules/facebook_status_tags/views/facebook_status_tags.views_default.inc facebook_status/submodules/facebook_status_tags/views/facebook_status_tags.views_default.inc
--- facebook_status-DRUPAL-6--3/submodules/facebook_status_tags/views/facebook_status_tags.views_default.inc	2011-02-03 20:36:56.000000000 +0000
+++ facebook_status/submodules/facebook_status_tags/views/facebook_status_tags.views_default.inc	2011-02-11 01:17:04.000000000 +0000
@@ -13,7 +13,7 @@ function facebook_status_tags_views_defa
   $view = new view;
   $view->name = 'facebook_status_tags';
   $view->description = 'Facebook-style Statuses Tags';
-  $view->tag = 'facebook_status';
+  $view->tag = 'Facebook-style Statuses';
   $view->view_php = '';
   $view->base_table = 'facebook_status';
   $view->is_cacheable = FALSE;
@@ -183,7 +183,7 @@ function facebook_status_tags_views_defa
       'validate_argument_node_access' => 0,
       'validate_argument_nid_type' => 'nid',
       'validate_argument_vocabulary' => array(
-        '1' => 1,
+        '1' => 0,
         '4' => 0,
         '3' => 0,
         '2' => 0,