diff --git a/src/block.c b/src/block.c
index dc808f27..44742aa9 100644
--- a/src/block.c
+++ b/src/block.c
@@ -1472,7 +1472,7 @@ void BlockProcessBombChains(void)
     // Update each bomb chain every 4 frames
     pChain = gBombChains;
     pChain += (gFrameCounter8Bit & 3);
-    
+
     if (pChain->currentOffset == 0)
         return;
 
diff --git a/src/data/block_data.c b/src/data/block_data.c
index 42447353..a5d1db88 100644
--- a/src/data/block_data.c
+++ b/src/data/block_data.c
@@ -91,8 +91,8 @@ const u16 sClipdataAffectingActionDamageTypes[MAX_AMOUNT_OF_CAA] = {
     [CAA_NONE] =                   CAA_DAMAGE_TYPE_NONE,
     [CAA_REMOVE_SOLID] =           CAA_DAMAGE_TYPE_NONE,
     [CAA_MAKE_SOLID_GRIPPABLE] =   CAA_DAMAGE_TYPE_NONE,
-    [CAA_MAKE_STOP_ENEMY] =            CAA_DAMAGE_TYPE_NONE,
-    [CAA_MAKE_NON_POWER_GRIP] =            CAA_DAMAGE_TYPE_NONE,
+    [CAA_MAKE_STOP_ENEMY] =        CAA_DAMAGE_TYPE_NONE,
+    [CAA_MAKE_NON_POWER_GRIP] =    CAA_DAMAGE_TYPE_NONE,
     [CAA_BOMB_CHAIN_UNUSED] =      CAA_DAMAGE_TYPE_NONE,
     [CAA_BEAM] =                   CAA_DAMAGE_TYPE_BEAM,
     [CAA_BOMB_PISTOL] =            CAA_DAMAGE_TYPE_BOMB_PISTOL,
@@ -221,7 +221,9 @@ const struct BlockBehavior sBlockBehaviors[MAX_AMOUNT_OF_BLOCKS] = {
     [BEHAVIOR_TO_BLOCK(CLIP_BEHAVIOR_SUPER_MISSILE_BLOCK_NO_REFORM)] = {
         .lifeType = BLOCK_LIFE_TYPE_NO_NEVER_REFORM,
         .subType = BLOCK_SUB_TYPE_REFORM,
-        .type = BLOCK_TYPE_SUPER_MISSILE_NO_REFORM
+        .type = BLOCK_TYPE_SUPER_MISSILE_NO_REFORM,
+        .isSpeedboost = FALSE,
+        .isBombChain = FALSE
     },
     [BEHAVIOR_TO_BLOCK(CLIP_BEHAVIOR_SPEEDBOOST_BLOCK_NO_REFORM)] = {
         .lifeType = BLOCK_LIFE_TYPE_NO_NEVER_REFORM,
diff --git a/src/sprite_util.c b/src/sprite_util.c
index 46260837..72a279f6 100644
--- a/src/sprite_util.c
+++ b/src/sprite_util.c
@@ -7,6 +7,7 @@
 #include "sprites_AI/acid_worm.h"
 #include "data/sprite_data.h"
 
+#include "constants/audio.h"
 #include "constants/clipdata.h"
 #include "constants/game_state.h"
 #include "constants/samus.h"
@@ -652,7 +653,8 @@ void SpriteUtilSamusAndSpriteCollision(void)
                                 break;
 
                             case SPOSE_BALLSPARKING:
-                                SoundStop(0x8F);
+                                SoundStop(SOUND_BALLSPARKING);
+
                             case SPOSE_MORPH_BALL_MIDAIR:
                                 pData->yPosition = pSprite->yPosition + 0x3C;
                                 pData->xPosition = pSprite->xPosition;