diff --git a/BaS_gcc/sys/BaS.c b/BaS_gcc/sys/BaS.c
index ad8974c..833e3f9 100644
--- a/BaS_gcc/sys/BaS.c
+++ b/BaS_gcc/sys/BaS.c
@@ -223,7 +223,9 @@ void enable_coldfire_interrupts()
 
 void disable_coldfire_interrupts()
 {
+#ifdef MACHINE_FIREBEE
 	*FPGA_INTR_ENABLE = 0;		/* disable all interrupts */
+#endif /* MACHINE_FIREBEE */
 	MCF_EPORT_EPIER = 0x0;
 	MCF_EPORT_EPFR = 0x0;
 	MCF_INTC_IMRL = 0xfffffffe;
@@ -326,13 +328,6 @@ void BaS(void)
 
 #ifdef MACHINE_FIREBEE /* m5484lite has no ACIA and no dip switch... */
 	acia_init();
-
-	/* Test for pseudo-supervisor mode: DIP switch #6 down */
-	if (DIP_SWITCH & (1 << 7)) {
-		/* In this mode, the OS actually runs in user mode
-		 * and all the supervisor instructions are emulated. */
-		__asm__ __volatile__("move.w #0x0700,sr	\n\t" : : : "memory");
-	}
 #endif /* MACHINE_FIREBEE */
 
 	srec_execute("BASFLASH.S19");
diff --git a/BaS_gcc/sys/sysinit.c b/BaS_gcc/sys/sysinit.c
index eeb20e1..0835aab 100644
--- a/BaS_gcc/sys/sysinit.c
+++ b/BaS_gcc/sys/sysinit.c
@@ -143,13 +143,13 @@ void init_gpio(void)
 	 * /PCIBR1 as /PCIBR1
 	 * /PCIBR0 as /PCIBR0
 	 */
-#if MACHINE_FIREBEE
+#if defined(MACHINE_FIREBEE)
 	MCF_PAD_PAR_PCIBR = MCF_PAD_PAR_PCIBR_PAR_PCIBR4_IRQ4 |
 			MCF_PAD_PAR_PCIBR_PAR_PCIBR3_GPIO |
 			MCF_PAD_PAR_PCIBR_PAR_PCIBR2_PCIBR2 |
 			MCF_PAD_PAR_PCIBR_PAR_PCIBR1_PCIBR1 |
 			MCF_PAD_PAR_PCIBR_PAR_PCIBR0_PCIBR0;
-#elif MACHINE_M5484LITE
+#elif defined(MACHINE_M5484LITE)
 	MCF_PAD_PAR_PCIBR = MCF_PAD_PAR_PCIBR_PAR_PCIBR4_PCIBR4 |
 			MCF_PAD_PAR_PCIBR_PAR_PCIBR3_PCIBR3 |
 			MCF_PAD_PAR_PCIBR_PAR_PCIBR2_PCIBR2 |