diff --git a/modules/comment/comment.module b/modules/comment/comment.module
index 58e9ce6..964978e 100644
--- a/modules/comment/comment.module
+++ b/modules/comment/comment.module
@@ -1050,7 +1050,7 @@ function comment_render($node, $cid = 0) {
       $output .= comment_form_box(array('nid' => $nid), t('Post new comment'));
     }
 
-    if ($output) {
+    if (!empty($output)) {
       $output = theme('comment_wrapper', $output, $node);
     }
   }
diff --git a/modules/profile/profile.install b/modules/profile/profile.install
index e2a7612..94b0a34 100644
--- a/modules/profile/profile.install
+++ b/modules/profile/profile.install
@@ -138,6 +138,7 @@ function profile_schema() {
     'primary key' => array('uid', 'fid'),
     'indexes' => array(
       'fid' => array('fid'),
+      'uid' => array('uid'),
     ),
   );