diff --git a/mockingboard/ksp_theme_6ch.s b/mockingboard/ksp_theme_6ch.s
index beab26f8..d84fb716 100644
--- a/mockingboard/ksp_theme_6ch.s
+++ b/mockingboard/ksp_theme_6ch.s
@@ -63,11 +63,12 @@ mockingboard_found:
 	; load pointer to the music
 	;===========================
 
-	lda	#<ksp_theme2
+	lda	#<ksp_theme
 	sta	INL
-	lda	#>ksp_theme2
+	lda	#>ksp_theme
 	sta	INH
 
+	ldy	#0
 	lda	(INL),Y		; read in frame delay
 	sta	MB_FRAME_DIFF
 	inc	INL		; FIXME: should check if we oflowed
@@ -78,6 +79,7 @@ mockingboard_found:
 	lda	#>ksp_theme2
 	sta	NUM1H
 
+	ldy	#0
 	lda	(NUM1L),Y	; read in frame delay
 	sta	MB_FRAME_DIFF2
 	inc	NUM1L		; FIXME: should check if we oflowed
diff --git a/mockingboard/ksp_theme_interrupt.s b/mockingboard/ksp_theme_interrupt.s
index 9e13dae3..d76fc0bf 100644
--- a/mockingboard/ksp_theme_interrupt.s
+++ b/mockingboard/ksp_theme_interrupt.s
@@ -390,7 +390,7 @@ top_regs:
 	ldx	#$7			; load X as 7 (we increment first)
 top_regs_loop:
 	inx				; increment
-	cpx	#$16
+	cpx	#16
 	beq	done_with_masks		; exit if done
 
 	ror	MASK