diff --git a/hooks.asm b/hooks.asm
index d8c268c..9e1c1e1 100755
--- a/hooks.asm
+++ b/hooks.asm
@@ -2318,7 +2318,7 @@ JSL.l DrawHeartPieceGFX
 org $05F08A ; <- 2F08A - sprite_heart_upgrades.asm : 324 - (LDA $7EF36B : INC A : AND.b #$03 : STA $7EF36B : BNE .got_4_piecese) item determination
 JSL.l HeartPieceGet
 BCS $18 ; reinsert the near branch that appears midway through what we overrode
-NOP #22
+BRA + : NOP #20 : +
 ;--------------------------------------------------------------------------------
 org $06C0B0 ; <- 340B0 - sprite prep
 JSL.l HeartPieceSpritePrep
diff --git a/music.asm b/music.asm
index 68848b5..dcdd9df 100644
--- a/music.asm
+++ b/music.asm
@@ -306,6 +306,6 @@ Underworld_DoorDown_Entry:
 ;--------------------------------------------------------------------------------
 ; Check if the boss in ToH has been defeated (16-bit accumulator)
 CheckHeraBossDefeated:
-    LDA RoomDataWRAM[$08].high : AND #$00FF
-	RTL
-;--------------------------------------------------------------------------------
+LDA RoomDataWRAM[$07].high : AND.w #$00FF : BEQ +
+    SEC : RTL
++ CLC : RTL