diff --git a/c64/kernal/iec/iec_rx_check_eoi.s b/c64/kernal/iec/iec_rx_check_eoi.s
index 386940e4..6b5e9403 100644
--- a/c64/kernal/iec/iec_rx_check_eoi.s
+++ b/c64/kernal/iec/iec_rx_check_eoi.s
@@ -4,6 +4,9 @@
 // Helper routine to check for EOI while receiving byte from IEC
 //
 
+#if CONFIG_IEC
+
+
 iec_rx_check_eoi:
 
 	// Wait for talker to pull CLK.
@@ -36,4 +39,7 @@ iec_rx_check_eoi_done:
 	rts
 
 
+#endif // CONFIG_IEC
+
+
 #endif // ROM layout
diff --git a/c64/kernal/iostack/load_save_common.s b/c64/kernal/iostack/load_save_common.s
index e5562158..d8350989 100644
--- a/c64/kernal/iostack/load_save_common.s
+++ b/c64/kernal/iostack/load_save_common.s
@@ -243,7 +243,7 @@ lvs_success_end:
 	clc
 	rts
 
-#endif // XXX is this endif in propeer place?
+#endif
 
 lvs_device_not_found_error:
 
@@ -255,6 +255,8 @@ lvs_illegal_device_number:
 	jsr kernalstatus_DEVICE_NOT_FOUND
 	jmp kernalerror_ILLEGAL_DEVICE_NUMBER
 
+#if CONFIG_TAPE_NORMAL || CONFIG_TAPE_TURBO || CONFIG_IEC
+
 lvs_load_verify_error:
 	// XXX should we really return BASIC error code here?
 	lda VERCKK
@@ -268,5 +270,7 @@ lvs_verify_error:
 	sec
 	rts
 
+#endif
+
 
 #endif // ROM layout