diff --git modules/comment/comment.module modules/comment/comment.module
index 950d4a6..0937dc4 100644
--- modules/comment/comment.module
+++ modules/comment/comment.module
@@ -130,7 +130,10 @@ function comment_entity_info() {
  * Entity path callback.
  */
 function comment_path($comment) {
-  return 'comment/' . $comment->cid;
+  return array(
+    'path' => 'comment/' . $comment->cid,
+    'options' => array('fragment' => 'comment-' . $comment->cid),
+  );
 }
 
 /**
diff --git modules/image/image.field.inc modules/image/image.field.inc
index c848a70..4078917 100644
--- modules/image/image.field.inc
+++ modules/image/image.field.inc
@@ -461,7 +461,7 @@ function image_field_formatter_view($obj_type, $object, $field, $instance, $lang
 
   // Check if the formatter involves a link.
   if (strpos($display['type'], 'image_link_content') === 0) {
-    $path = entity_path($obj_type, $object);
+    $path = current(entity_path($obj_type, $object));
   }
   elseif (strpos($display['type'], 'image_link_file') === 0) {
     $link_file = TRUE;
diff --git modules/node/node.module modules/node/node.module
index b69376e..bc0ea6f 100644
--- modules/node/node.module
+++ modules/node/node.module
@@ -246,7 +246,9 @@ function node_entity_info() {
  * Entity path callback.
  */
 function node_path($node) {
-  return 'node/' . $node->nid;
+  return array(
+    'path' => 'node/' . $node->nid,
+  );
 }
 
 /**
diff --git modules/taxonomy/taxonomy.module modules/taxonomy/taxonomy.module
index 3d617dd..5d1a02d 100644
--- modules/taxonomy/taxonomy.module
+++ modules/taxonomy/taxonomy.module
@@ -133,7 +133,9 @@ function taxonomy_entity_info() {
  * Entity path callback.
  */
 function taxonomy_term_path($term) {
-  return 'taxonomy/term/' . $term->tid;
+  return array(
+    'path' => 'taxonomy/term/' . $term->tid,
+  );
 }
 
 /**
diff --git modules/user/user.module modules/user/user.module
index 0baf9c7..959048a 100644
--- modules/user/user.module
+++ modules/user/user.module
@@ -153,7 +153,9 @@ function user_entity_info() {
  * Entity path callback.
  */
 function user_path($user) {
-  return 'user/' . $user->uid;
+  return array(
+    'path' => 'user/' . $user->uid,
+  );
 }
 
 /**