diff --git a/Makefile b/Makefile
index 5093396..ced368f 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@
 
 export TARGET := fastboot3DS
 ENTRY9        := 0x080000D4
-ENTRY11       := 0x1FF89040
+ENTRY11       := 0x1FF89034
 SECTION0_ADR  := 0x080000C0
 SECTION0_TYPE := 0
 SECTION0_FILE := arm9/$(TARGET)9.bin
diff --git a/include/arm11/debug.h b/include/arm11/debug.h
index 1bf0726..aa91211 100644
--- a/include/arm11/debug.h
+++ b/include/arm11/debug.h
@@ -47,5 +47,5 @@
 
 static inline undefInstrTest(void)
 {
-	__asm__ volatile(".word 0xFFFFFFFF" : :);
+	__asm__ volatile("udf #0xDEAD" : :);
 }*/
diff --git a/source/arm11/start.s b/source/arm11/start.s
index 4890ca6..626a7c3 100644
--- a/source/arm11/start.s
+++ b/source/arm11/start.s
@@ -64,20 +64,19 @@
 vectors:
 	ldr pc, resetHandlerPtr         @ Reset vector
 	ldr pc, undefInstrHandlerPtr    @ Undefined instruction vector
-	ldr pc, svcHandlerPtr           @ Software interrupt (SVC) vector
+	udf #3                          @ Software interrupt (SVC) vector
 	ldr pc, prefetchAbortHandlerPtr @ Prefetch abort vector
 	ldr pc, dataAbortHandlerPtr     @ Data abort vector
-	ldr pc, reservedHandlerPtr      @ Reserved (unused) vector
+	udf #6                          @ Reserved (unused) vector
 	ldr pc, irqHandlerPtr           @ Interrupt (IRQ) vector
-	ldr pc, fiqHandlerPtr           @ Fast interrupt (FIQ) vector
+	udf #8                          @ Fast interrupt (FIQ) vector
 	resetHandlerPtr:         .word _start
 	undefInstrHandlerPtr:    .word undefInstrHandler
-	svcHandlerPtr:           .word (vectors + 0x08)
+	@svcHandlerPtr:           .word (vectors + 0x08)
 	prefetchAbortHandlerPtr: .word prefetchAbortHandler
 	dataAbortHandlerPtr:     .word dataAbortHandler
-	reservedHandlerPtr:      .word (vectors + 0x14)
 	irqHandlerPtr:           .word irqHandler
-	fiqHandlerPtr:           .word (vectors + 0x1C)
+	@fiqHandlerPtr:           .word (vectors + 0x1C)
 
 
 _start:
diff --git a/source/arm9/start.s b/source/arm9/start.s
index d1a75ab..6c615e0 100644
--- a/source/arm9/start.s
+++ b/source/arm9/start.s
@@ -149,9 +149,9 @@
 _vectorStubs:
 	ldr pc, irqHandlerPtr
 	irqHandlerPtr:                  .word irqHandler
-	ldr pc, fiqHandlerPtr
+	udf #2
 	fiqHandlerPtr:                  .word (A9_VECTORS_START + 0x08)
-	ldr pc, svcHandlerPtr
+	udf #3
 	svcHandlerPtr:                  .word (A9_VECTORS_START + 0x10)
 	ldr pc, undefInstrHandlerPtr
 	undefInstrHandlerPtr:           .word undefInstrHandler