2 files changed, 3 insertions, 3 deletions
diff --git a/upb/msg.c b/upb/msg.c
index 34525b7..f1070d7 100644
--- a/upb/msg.c
+++ b/upb/msg.c
@@ -340,8 +340,8 @@ static upb_msglayout *upb_msglayout_new(const upb_msgdef *m) {
   }
 
   /* Size of the entire structure should be a multiple of its greatest
-   * alignment. */
-  l->data.size = align_up(l->data.size, 8 /* TODO: track for real? */);
+   * alignment.  TODO: track overall alignment for real? */
+  l->data.size = align_up(l->data.size, 8);
 
   if (upb_msglayout_initdefault(l, m)) {
     return l;
diff --git a/upb/msg.h b/upb/msg.h
index ee1e2fb..7026a50 100644
--- a/upb/msg.h
+++ b/upb/msg.h
@@ -408,7 +408,7 @@ typedef struct upb_msglayout_msginit_v1 {
   const upb_msglayout_oneofinit_v1 *oneofs;
   void *default_msg;
   /* Must be aligned to sizeof(void*).  Doesn't include internal members like
-   * unknown * fields, extension dict, pointer to msglayout, etc. */
+   * unknown fields, extension dict, pointer to msglayout, etc. */
   uint32_t size;
   uint16_t field_count;
   uint16_t oneof_count;