diff -urp user_relationships.origin/user_relationships/user_relationship_blocks/user_relationship_blocks.install user_relationships/user_relationship_blocks/user_relationship_blocks.install
--- user_relationships.origin/user_relationships/user_relationship_blocks/user_relationship_blocks.install	2008-10-30 04:49:33.000000000 -0800
+++ user_relationships/user_relationship_blocks/user_relationship_blocks.install	2008-11-07 17:37:16.046206104 -0800
@@ -12,7 +12,7 @@ function user_relationship_blocks_schema
   $schema['user_relationship_blocks'] = array(
     'fields' => array(
       'bid'         => array('type' => 'varchar', 'length' => 255, 'not null' => TRUE, 'default' => ''),
-      'size'        => array('type' => 'int', 'unsigned' => TRUE, 'default' => 10),
+      'size'        => array('type' => 'int', 'unsigned' => FALSE, 'default' => 10),
       'sort'        => array('type' => 'varchar', 'length' => 255, 'default' => 'newest'),
       'get_account' => array('type' => 'text', 'not null' => TRUE, 'size' => 'big'),
     ),
diff -urp user_relationships.origin/user_relationships/user_relationship_defaults/user_relationship_defaults.install user_relationships/user_relationship_defaults/user_relationship_defaults.install
--- user_relationships.origin/user_relationships/user_relationship_defaults/user_relationship_defaults.install	2008-04-20 17:38:18.000000000 -0700
+++ user_relationships/user_relationship_defaults/user_relationship_defaults.install	2008-11-07 17:37:16.047205952 -0800
@@ -4,9 +4,9 @@
 function user_relationship_defaults_schema() {
   $schema['user_relationship_defaults'] = array(
     'fields'  => array(
-      'rdid'          => array('type' => 'serial', 'unsigned' => TRUE, 'not null' => TRUE),
-      'uid'           => array('type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE, 'default' => 0),
-      'rtid'          => array('type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE, 'default' => 0),
+      'rdid'          => array('type' => 'serial', 'unsigned' => FALSE, 'not null' => TRUE),
+      'uid'           => array('type' => 'int', 'unsigned' => FALSE, 'not null' => TRUE, 'default' => 0),
+      'rtid'          => array('type' => 'int', 'unsigned' => FALSE, 'not null' => TRUE, 'default' => 0),
     ),
     'indexes' => array(
       'uid'   => array('uid'),
diff -urp user_relationships.origin/user_relationships/user_relationship_elaborations/user_relationship_elaborations.install user_relationships/user_relationship_elaborations/user_relationship_elaborations.install
--- user_relationships.origin/user_relationships/user_relationship_elaborations/user_relationship_elaborations.install	2008-10-20 01:38:31.000000000 -0700
+++ user_relationships/user_relationship_elaborations/user_relationship_elaborations.install	2008-11-07 17:37:16.049205648 -0800
@@ -8,7 +8,7 @@
 function user_relationship_elaborations_schema() {
   $schema['user_relationship_elaborations'] = array(
     'fields' => array(
-      'rid'         => array('type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE, 'default' => 0),
+      'rid'         => array('type' => 'int', 'unsigned' => FALSE, 'not null' => TRUE, 'default' => 0),
       'elaboration' => array('type' => 'text', 'not null' => TRUE, 'size' => 'big'),
     ),
     'primary key' => array('rid'),
diff -urp user_relationships.origin/user_relationships/user_relationship_implications/user_relationship_implications.install user_relationships/user_relationship_implications/user_relationship_implications.install
--- user_relationships.origin/user_relationships/user_relationship_implications/user_relationship_implications.install	2008-04-20 17:38:18.000000000 -0700
+++ user_relationships/user_relationship_implications/user_relationship_implications.install	2008-11-07 17:37:16.050205496 -0800
@@ -4,11 +4,11 @@
 function user_relationship_implications_schema() {
   $schema['user_relationship_implications'] = array(
     'fields'  => array(
-      'riid'          => array('type' => 'serial', 'unsigned' => TRUE, 'not null' => TRUE),
-      'rtid'          => array('type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE, 'default' => 0),
-      'implies_rtid'  => array('type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE, 'default' => 0),
-      'strict'        => array('type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE, 'default' => 0, 'size' => 'tiny'),
-      'reverse'       => array('type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE, 'default' => 0, 'size' => 'tiny'),
+      'riid'          => array('type' => 'serial', 'unsigned' => FALSE, 'not null' => TRUE),
+      'rtid'          => array('type' => 'int', 'unsigned' => FALSE, 'not null' => TRUE, 'default' => 0),
+      'implies_rtid'  => array('type' => 'int', 'unsigned' => FALSE, 'not null' => TRUE, 'default' => 0),
+      'strict'        => array('type' => 'int', 'unsigned' => FALSE, 'not null' => TRUE, 'default' => 0, 'size' => 'tiny'),
+      'reverse'       => array('type' => 'int', 'unsigned' => FALSE, 'not null' => TRUE, 'default' => 0, 'size' => 'tiny'),
     ),
     'indexes' => array(
       'rtid'          => array('rtid'),
@@ -44,7 +44,7 @@ function user_relationship_implications_
     $ret,
     'user_relationship_implications',
     'reverse',
-    array('type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE, 'default' => 0, 'size' => 'tiny')
+    array('type' => 'int', 'unsigned' => FALSE, 'not null' => TRUE, 'default' => 0, 'size' => 'tiny')
   );
 
   return $ret;
diff -urp user_relationships.origin/user_relationships/user_relationship_node_access/user_relationship_node_access.install user_relationships/user_relationship_node_access/user_relationship_node_access.install
--- user_relationships.origin/user_relationships/user_relationship_node_access/user_relationship_node_access.install	2008-09-27 23:18:48.000000000 -0700
+++ user_relationships/user_relationship_node_access/user_relationship_node_access.install	2008-11-07 17:37:16.053205040 -0800
@@ -4,7 +4,7 @@
 function user_relationship_node_access_schema() {
   $schema['user_relationship_node_access'] = array(
     'fields' => array(
-      'nid'         => array('type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE, 'default' => 0),
+      'nid'         => array('type' => 'int', 'unsigned' => FALSE, 'not null' => TRUE, 'default' => 0),
       'permissions' => array('type' => 'text', 'not null' => TRUE, 'default' => '', 'size' => 'big'),
     ),
     'primary key' => array('nid'),
diff -urp user_relationships.origin/user_relationships/user_relationships_api/user_relationships_api.install user_relationships/user_relationships_api/user_relationships_api.install
--- user_relationships.origin/user_relationships/user_relationships_api/user_relationships_api.install	2008-10-14 02:14:03.000000000 -0700
+++ user_relationships/user_relationships_api/user_relationships_api.install	2008-11-07 17:37:16.054204888 -0800
@@ -9,14 +9,14 @@
 function user_relationships_api_schema() {
   $schema['user_relationships'] = array(
     'fields' => array(
-      'rid'           => array('type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE, 'default' => 0),
-      'requester_id'  => array('type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE, 'default' => 0),
-      'requestee_id'  => array('type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE, 'default' => 0),
-      'rtid'          => array('type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE, 'default' => 0),
-      'approved'      => array('type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE, 'default' => 0, 'size' => 'tiny'),
-      'created_at'    => array('type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE, 'default' => 0),
-      'updated_at'    => array('type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE, 'default' => 0),
-      'flags'         => array('type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE, 'default' => 0),
+      'rid'           => array('type' => 'int', 'unsigned' => FALSE, 'not null' => TRUE, 'default' => 0),
+      'requester_id'  => array('type' => 'int', 'unsigned' => FALSE, 'not null' => TRUE, 'default' => 0),
+      'requestee_id'  => array('type' => 'int', 'unsigned' => FALSE, 'not null' => TRUE, 'default' => 0),
+      'rtid'          => array('type' => 'int', 'unsigned' => FALSE, 'not null' => TRUE, 'default' => 0),
+      'approved'      => array('type' => 'int', 'unsigned' => FALSE, 'not null' => TRUE, 'default' => 0, 'size' => 'tiny'),
+      'created_at'    => array('type' => 'int', 'unsigned' => FALSE, 'not null' => TRUE, 'default' => 0),
+      'updated_at'    => array('type' => 'int', 'unsigned' => FALSE, 'not null' => TRUE, 'default' => 0),
+      'flags'         => array('type' => 'int', 'unsigned' => FALSE, 'not null' => TRUE, 'default' => 0),
     ),
     'unique keys' => array(
       'relationship' => array('requester_id', 'requestee_id', 'rtid'),
@@ -31,12 +31,12 @@ function user_relationships_api_schema()
 
   $schema['user_relationship_types'] = array(
     'fields' => array(
-      'rtid'              => array('type' => 'serial', 'unsigned' => TRUE, 'not null' => TRUE),
+      'rtid'              => array('type' => 'serial', 'unsigned' => FALSE, 'not null' => TRUE),
       'name'              => array('type' => 'varchar', 'length' => 255, 'not null' => TRUE, 'default' => ''),
       'plural_name'       => array('type' => 'varchar', 'length' => 255, 'not null' => TRUE, 'default' => ''),
-      'is_oneway'         => array('type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE, 'default' => 0, 'size' => 'tiny'),
-      'requires_approval' => array('type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE, 'default' => 0, 'size' => 'tiny'),
-      'expires_val'       => array('type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE, 'default' => 0),
+      'is_oneway'         => array('type' => 'int', 'unsigned' => FALSE, 'not null' => TRUE, 'default' => 0, 'size' => 'tiny'),
+      'requires_approval' => array('type' => 'int', 'unsigned' => FALSE, 'not null' => TRUE, 'default' => 0, 'size' => 'tiny'),
+      'expires_val'       => array('type' => 'int', 'unsigned' => FALSE, 'not null' => TRUE, 'default' => 0),
     ),
     'unique keys' => array(
       'name'  => array('name'),
diff -urp user_relationships.origin/user_relationships/user_relationships_api/user_relationships_api.module user_relationships/user_relationships_api/user_relationships_api.module
--- user_relationships.origin/user_relationships/user_relationships_api/user_relationships_api.module	2008-10-28 03:28:44.000000000 -0800
+++ user_relationships/user_relationships_api/user_relationships_api.module	2008-11-07 19:00:30.123990880 -0800
@@ -109,7 +109,7 @@ function _user_relationships_generate_qu
   $extra = is_array($extra) ? implode(' ', $extra) : $extra;
 
   return array(
-    'query'     => "SELECT {$selects} FROM {user_relationships} ur {$joins} {$cond} GROUP BY rid {$extra}",
+    'query'     => "SELECT {$selects} FROM {user_relationships} ur {$joins} {$cond} {$extra}",
     'count'     => "SELECT COUNT(DISTINCT rid) AS count FROM {user_relationships} ur {$count_joins} {$cond}",
     'arguments' => $arguments,
   );
diff -urp user_relationships.origin/user_relationships/user_relationships_ui/user_relationships_ui.admin_actions.inc user_relationships/user_relationships_ui/user_relationships_ui.admin_actions.inc
--- user_relationships.origin/user_relationships/user_relationships_ui/user_relationships_ui.admin_actions.inc	2008-10-28 03:28:44.000000000 -0800
+++ user_relationships/user_relationships_ui/user_relationships_ui.admin_actions.inc	2008-11-07 17:38:39.403533864 -0800
@@ -14,13 +14,13 @@ function user_relationships_ui_type_edit
     (isset($form_state['values']['rtid']) &&
       db_result(db_query(
         "SELECT name FROM {user_relationship_types}
-         WHERE LOWER(`name`) = LOWER('%s')
+         WHERE LOWER(name) = LOWER('%s')
            AND rtid != %d",
         $form_state['values']['name'], $form_state['values']['rtid'])
       )
     ) ||
     (!isset($form_state['values']['rtid']) &&
-      db_result(db_query("SELECT name FROM {user_relationship_types} WHERE LOWER(`name`) = LOWER('%s')", $form_state['values']['name']))
+      db_result(db_query("SELECT name FROM {user_relationship_types} WHERE LOWER(name) = LOWER('%s')", $form_state['values']['name']))
     )
   ) {
     form_set_error('name', t('%name has already been used.', array('%name' => $form_state['values']['name'])));