diff --git a/ement-room.el b/ement-room.el
index 8700318..862e62b 100644
--- a/ement-room.el
+++ b/ement-room.el
@@ -138,7 +138,8 @@ To be used as the pretty-printer for `ewoc-create'."
                             (_ 'default)))
                (string (propertize (pcase type
                                      ("m.room.message" body)
-                                     ("m.room.member" (alist-get 'membership content)))
+                                     ("m.room.member" (alist-get 'membership content))
+                                     (_ (concat "EVENT-TYPE: " type)))
                                    'face body-face)))
     (concat timestamp string)))
 
diff --git a/ement.el b/ement.el
index f52d9a0..d9b0cc4 100644
--- a/ement.el
+++ b/ement.el
@@ -163,7 +163,7 @@ SINCE may be such a token."
   (pcase-let* (((map rooms) data)
                ((map ('join joined-rooms)) rooms)
                ;; FIXME: Only counts events in joined-rooms list.
-               (num-events (cl-loop for room in joined-rooms
+               (num-events (cl-loop for (_id . room) in joined-rooms
                                     sum (length (map-nested-elt room '(state events)))
                                     sum (length (map-nested-elt room '(timeline events)))))
                (ement-progress-reporter (make-progress-reporter "Ement: Reading events..." 0 num-events))