diff --git a/2waymirror.asm b/2waymirror.asm
index 79741a1..be77bfa 100644
--- a/2waymirror.asm
+++ b/2waymirror.asm
@@ -1,18 +1,31 @@
 pushpc
 
-org $8DF7F1
+org $8DF7E9
+dw $28DE, $28DF, $28EE, $28EF ; Scroll
 dw $2C62, $2C63, $2C72, $2C73 ; Mirror
 dw $2C62, $2C63, $2C72, $2D11 ; 2-Way Mirror
 
 org $87A93F
 JSL.l CheckMirrorWorld
 
+org $87A955
+JSL.l BlockEraseFix
+NOP #2
+
 pullpc
 
 CheckMirrorWorld:
 	LDA.l MirrorEquipment
+	BEQ + ; just scroll, so don't allow
 	DEC
 	BNE +
 	LDA.b $8A
 	AND.b #$40
 +	RTL
+
+BlockEraseFix:
+	LDA.l MirrorEquipment
+	BEQ +
+		STZ.w $05FC
+		STZ.w $05FD
++	RTL
diff --git a/quickswap.asm b/quickswap.asm
index af55f57..86a51bb 100644
--- a/quickswap.asm
+++ b/quickswap.asm
@@ -83,10 +83,13 @@ LCode:
 RTS
 
 IsItemAvailable:
-        LDA.l InfiniteBombs : BEQ .finite
-        .infinite
-                CPX.b #$04 : BNE .finite
-                LDA.b #$01 : RTL
-        .finite
-                LDA.l EquipmentWRAM-1, X
+	CPX.b #$14 : BNE .not_mirror
+		LDA.b #$01 : RTL
+	.not_mirror
+	LDA.l InfiniteBombs : BEQ .finite
+	.infinite
+		CPX.b #$04 : BNE .finite
+		LDA.b #$01 : RTL
+	.finite
+		LDA.l EquipmentWRAM-1, X
 RTL
diff --git a/retro.asm b/retro.asm
index c145e87..be30e40 100644
--- a/retro.asm
+++ b/retro.asm
@@ -20,10 +20,11 @@ StoreBombCount:
 		PLA : STA.l BombsEquipment
 RTL
 SearchForEquippedItem:
-	LDA.l InfiniteBombs : BEQ +
-		LDA.b #$01 : LDX.b #$00 : RTL
-	+
-	LDA.l BowEquipment ; thing we wrote over
+	LDA.b #$01 : LDX.b #$00 : RTL
+	; LDA.l InfiniteBombs : BEQ +
+	; 	LDA.b #$01 : LDX.b #$00 : RTL
+	; +
+	; LDA.l BowEquipment ; thing we wrote over
 RTL
 
 DecrementArrows: