diff --git a/include/d/actor/d_a_itembase.h b/include/d/actor/d_a_itembase.h
index 1f72c50c3..541c8cde2 100644
--- a/include/d/actor/d_a_itembase.h
+++ b/include/d/actor/d_a_itembase.h
@@ -87,7 +87,7 @@ public:
     /* 0x638 */ s16 field_0x638;
     /* 0x63A */ u8 m_itemNo;
     /* 0x63B */ u8 mDrawFlags;
-};
+};  // Size: 0x63C
 
 STATIC_ASSERT(sizeof(daItemBase_c) == 0x63C);
 
diff --git a/include/d/actor/d_a_player_npc.h b/include/d/actor/d_a_player_npc.h
index 8c16c46f4..8eff8a698 100644
--- a/include/d/actor/d_a_player_npc.h
+++ b/include/d/actor/d_a_player_npc.h
@@ -39,7 +39,7 @@ public:
     BOOL checkNowPosMove(const char*);
     void drawDamageFog();
     int chkMoveBlock(cXyz*);
-};
+};  // Size: 0x4EC
 
 void* daPy_npc_JudgeForPNameAndDistance(void* i_actor, void* i_prm);
 fopAc_ac_c* daPy_npc_SearchAreaByName(fopAc_ac_c* i_this, s16 procName, f32 areaRadius, cXyz* outActorOffset);
diff --git a/include/d/d_door.h b/include/d/d_door.h
index d62b36e77..2a34ea0d3 100644
--- a/include/d/d_door.h
+++ b/include/d/d_door.h
@@ -53,7 +53,7 @@ public:
     /* 0x2C8 */ int mStaffId;
     /* 0x2CC */ s8 mRoomNo;
     /* 0x2CD */ u8 m2CD[0x2D0 - 0x2CD];
-};
+};  // Size: 0x2D0
 
 class dDoor_smoke_c {
 public:
diff --git a/src/JSystem/J3DGraphAnimator/J3DCluster.cpp b/src/JSystem/J3DGraphAnimator/J3DCluster.cpp
index 27f8acb4c..72488ca2c 100644
--- a/src/JSystem/J3DGraphAnimator/J3DCluster.cpp
+++ b/src/JSystem/J3DGraphAnimator/J3DCluster.cpp
@@ -433,7 +433,9 @@ void J3DSkinDeform::calcNrmMtx(J3DModel* model) {
 /* 802F4850-802F4974       .text deformVtxPos_F32__13J3DSkinDeformCFP8J3DModel */
 void J3DSkinDeform::deformVtxPos_F32(J3DModel* model) const {
     /* Nonmatching */
-    Mtx* mtxArr[] = { model->mpNodeMtx, model->mpWeightEnvMtx };
+    Mtx* mtxArr[2];
+    mtxArr[0] = model->mpNodeMtx;
+    mtxArr[1] = model->mpWeightEnvMtx;
     model->getVertexBuffer()->swapTransformedVtxPos();
 
     s32 vtxNum = model->getModelData()->getVtxNum();
@@ -452,7 +454,9 @@ void J3DSkinDeform::deformVtxPos_F32(J3DModel* model) const {
 /* 802F4974-802F4AB4       .text deformVtxPos_S16__13J3DSkinDeformCFP8J3DModel */
 void J3DSkinDeform::deformVtxPos_S16(J3DModel* model) const {
     /* Nonmatching */
-    Mtx* mtxArr[] = { model->mpNodeMtx, model->mpWeightEnvMtx };
+    Mtx* mtxArr[2];
+    mtxArr[0] = model->mpNodeMtx;
+    mtxArr[1] = model->mpWeightEnvMtx;
 
     J3DGQRSetup7(model->getModelData()->getVertexData().getVtxPosFrac(), 7, model->getModelData()->getVertexData().getVtxPosFrac(), 7);
     model->getVertexBuffer()->swapTransformedVtxPos();