diff --git a/facetapi.admin.inc b/facetapi.admin.inc
index 66ab74a..88f428d 100644
--- a/facetapi.admin.inc
+++ b/facetapi.admin.inc
@@ -195,7 +195,7 @@ function facetapi_realm_settings_form_submit($form, &$form_state) {
     if ('block' == $form['#facetapi']['realm']['name']) {
       drupal_set_message(t(
         'To enable or arrange the facet blocks, visit the <a href="@block-page">blocks administration page</a>.',
-        array('@block-page' => url('admin/structure/block', array('query' => array('destination' => $_GET['q']))))
+        array('@block-page' => url('admin/build/block', array('query' => array('destination' => $_GET['q']))))
       ));
     }
   }
diff --git a/facetapi.api.php b/facetapi.api.php
index b85009f..53a88e4 100644
--- a/facetapi.api.php
+++ b/facetapi.api.php
@@ -103,7 +103,7 @@ function hook_facetapi_realm_info() {
       'settings callback' => 'facetapi_block_realm_settings',
       'description' => t(
         'The <em>Blocks</em> realm displays each facet in a separate <a href="@block-page">block</a>. Users are able to refine their searches in a drill-down fashion.',
-        array('@block-page' => url('admin/structure/block', array('query' => array('destination' => $_GET['q']))))
+        array('@block-page' => url('admin/build/block', array('query' => array('destination' => $_GET['q']))))
       ),
     ),
   );
@@ -478,7 +478,7 @@ function hook_facetapi_force_delta_mapping() {
         // Machine readable names of facets whose mappping are being forced.
         // Regardless of whether they are enabled via the Facet API interface,
         // their blocks will be available to enable and position via
-        // admin/structure/block.
+        // admin/build/block.
         'facet_one',
         'facet_two',
       ),
diff --git a/facetapi.callbacks.inc b/facetapi.callbacks.inc
index 80567b9..8b16df4 100644
--- a/facetapi.callbacks.inc
+++ b/facetapi.callbacks.inc
@@ -27,14 +27,15 @@ function facetapi_map_bundle(array $values, array $options) {
  * Map callback for node authors.
  */
 function facetapi_map_author(array $values) {
-  $result = db_select('users', 'u')
-    ->fields('u', array('uid', 'name'))
-    ->condition('uid', $values, 'IN')
-    ->execute();
-
   $map = array();
-  while ($record = $result->fetchAssoc()) {
-    $map[$record['uid']] = $record['name'];
+  if (!empty($values)) {
+    $result = db_select('users', 'u')
+      ->fields('u', array('uid', 'name'))
+      ->condition('uid', $values, 'IN')
+      ->execute();
+    while ($record = $result->fetchAssoc()) {
+      $map[$record['uid']] = $record['name'];
+    }
   }
   if (isset($map[0])) {
     $map[0] = variable_get('anonymous', t('Anonymous'));
diff --git a/facetapi.facetapi.inc b/facetapi.facetapi.inc
index a029342..f5ce8a0 100644
--- a/facetapi.facetapi.inc
+++ b/facetapi.facetapi.inc
@@ -19,7 +19,7 @@ function facetapi_facetapi_realm_info() {
     'element type' => 'links',
     'description' => t(
       'The <em>Blocks</em> realm displays each facet in a separate <a href="@block-page">block</a>. Users are able to refine their searches in a drill-down fashion.',
-      array('@block-page' => url('admin/structure/block', array('query' => array('destination' => $_GET['q']))))
+      array('@block-page' => url('admin/build/block', array('query' => array('destination' => $_GET['q']))))
     ),
   );
 
diff --git a/facetapi.module b/facetapi.module
index 4c11a6d..56d2f6e 100644
--- a/facetapi.module
+++ b/facetapi.module
@@ -1083,7 +1083,7 @@ function facetapi_set_facet_status($searcher, $realm_name, $facet_name, $status,
  * If you are enabling facets in the block realm, you will have to force the
  * delta mapping so that the block can be configured even if it is disabled via
  * the Facet API interface. Otherwise you will not be able to assign the block
- * to a region because it won't be available in admin/structure/block.
+ * to a region because it won't be available in admin/build/block.
  *
  * @param $searcher
  *   The machine readable name of the searcher.
diff --git a/tests/facetapi.test b/tests/facetapi.test
index 96c9b4a..9a06fb6 100644
--- a/tests/facetapi.test
+++ b/tests/facetapi.test
@@ -100,7 +100,7 @@ class FacetapiTestCase extends DrupalWebTestCase {
 
       // Enables the facet in the "sidebar_first" region.
       $edit = array('blocks[' . $key . '][region]' => 'sidebar_first');
-      $this->drupalPost('admin/structure/block', $edit, t('Save blocks'));
+      $this->drupalPost('admin/build/block', $edit, t('Save blocks'));
 
       // Visits search page, raw value mimics return from default theme function.
       $this->drupalGet('facetapi_test/search');