diff --git a/gittle/gittle.py b/gittle/gittle.py
index 42f4b58..f3748b4 100644
--- a/gittle/gittle.py
+++ b/gittle/gittle.py
@@ -230,7 +230,7 @@ def recent_contributors(self, n=None, branch=None):
     @property
     def commit_count(self):
         try:
-            return len(self.ref_walker())
+            return len(list(self.ref_walker()))
         except KeyError:
             return 0
 
@@ -699,7 +699,7 @@ def rm(self, files, force=False):
         index = self.index
         index_files = filter(lambda f: f in index, files)
         for f in index_files:
-            del self.index[f]
+            del index[f]
         return index.write()
 
     def mv_fs(self, file_pair):
@@ -904,7 +904,9 @@ def file_versions(self, path):
                 seen_shas.add(file_sha)
 
             # Add file info
-            commit['file'] = file_data
+            # FIXME: WTF?
+            # commit['file'] = file_data
+            file_data['commit'] = commit['sha']
             versions.append(file_data)
         return versions