diff -up apachesolr.old/apachesolr.module apachesolr/apachesolr.module
--- apachesolr.old/apachesolr.module	2010-05-03 14:50:27.000000000 -0400
+++ apachesolr/apachesolr.module	2010-06-15 15:59:37.000000000 -0400
@@ -836,7 +836,7 @@ function apachesolr_get_facet_definition
 
 /**
  * Returns a member of the facet definitions array if it contains
- * $field as the 'field_name' element.
+ * $field as the 'facet_field' element.
  *
  * @param string $field
  *   The field_name being sought.
@@ -845,7 +845,7 @@ function apachesolr_get_facet_definition
   $definitions = apachesolr_get_facet_definitions();
   foreach ($definitions as $module => $facets) {
     foreach ($facets as $key => $values) {
-      if (isset($values['field_name']) && $values['field_name'] == $field_name) {
+      if (isset($values['facet_field']) && $values['facet_field'] == $field_name) {
         return $definitions[$module][$key];
       }
     }
diff -up apachesolr.old/apachesolr_search.module apachesolr/apachesolr_search.module
--- apachesolr.old/apachesolr_search.module	2010-06-08 12:52:47.000000000 -0400
+++ apachesolr/apachesolr_search.module	2010-06-15 16:06:09.000000000 -0400
@@ -975,7 +975,7 @@ function apachesolr_search_nested_facet_
 function apachesolr_search_taxonomy_get_term($tid) {
   if (function_exists('taxonomy_get_term')) {
     $term = taxonomy_get_term($tid);
-    return $term['name'];
+    return $term->name;
   }
 }