diff --git a/Makefile b/Makefile
index 5a31e2ec3..bf8a9d9c3 100644
--- a/Makefile
+++ b/Makefile
@@ -141,15 +141,16 @@ dist: dist-no-debug
 	cp stratosphere/creport/creport.elf atmosphere-$(AMSVER)-debug/creport.elf
 	cp stratosphere/dmnt/dmnt.elf atmosphere-$(AMSVER)-debug/dmnt.elf
 	cp stratosphere/eclct.stub/eclct.stub.elf atmosphere-$(AMSVER)-debug/eclct.stub.elf
+	cp stratosphere/erpt/erpt.elf atmosphere-$(AMSVER)-debug/erpt.elf
 	cp stratosphere/fatal/fatal.elf atmosphere-$(AMSVER)-debug/fatal.elf
+	cp stratosphere/jpegdec/jpegdec.elf atmosphere-$(AMSVER)-debug/jpegdec.elf
 	cp stratosphere/loader/loader.elf atmosphere-$(AMSVER)-debug/loader.elf
+	cp stratosphere/ncm/ncm.elf atmosphere-$(AMSVER)-debug/ncm.elf
+	cp stratosphere/pgl/pgl.elf atmosphere-$(AMSVER)-debug/pgl.elf
 	cp stratosphere/pm/pm.elf atmosphere-$(AMSVER)-debug/pm.elf
 	cp stratosphere/ro/ro.elf atmosphere-$(AMSVER)-debug/ro.elf
 	cp stratosphere/sm/sm.elf atmosphere-$(AMSVER)-debug/sm.elf
 	cp stratosphere/spl/spl.elf atmosphere-$(AMSVER)-debug/spl.elf
-	cp stratosphere/erpt/erpt.elf atmosphere-$(AMSVER)-debug/erpt.elf
-	cp stratosphere/jpegdec/jpegdec.elf atmosphere-$(AMSVER)-debug/jpegdec.elf
-	cp stratosphere/pgl/pgl.elf atmosphere-$(AMSVER)-debug/pgl.elf
 	cp troposphere/daybreak/daybreak.elf atmosphere-$(AMSVER)-debug/daybreak.elf
 	cd atmosphere-$(AMSVER)-debug; zip -r ../atmosphere-$(AMSVER)-debug.zip ./*; cd ../;
 	rm -r atmosphere-$(AMSVER)-debug
diff --git a/stratosphere/boot2/boot2.json b/stratosphere/boot2/boot2.json
index 74025f46f..5c83aba79 100644
--- a/stratosphere/boot2/boot2.json
+++ b/stratosphere/boot2/boot2.json
@@ -11,6 +11,7 @@
     "pool_partition":    2,
     "is_64_bit":    true,
     "address_space_type":    3,
+    "disable_device_address_space_merge":    true,
     "filesystem_access":    {
         "permissions":    "0xFFFFFFFFFFFFFFFF"
     },
diff --git a/stratosphere/creport/creport.json b/stratosphere/creport/creport.json
index 8c53f4b08..ff014cbb7 100644
--- a/stratosphere/creport/creport.json
+++ b/stratosphere/creport/creport.json
@@ -11,6 +11,7 @@
     "pool_partition": 2,
     "is_64_bit": true,
     "address_space_type": 3,
+    "disable_device_address_space_merge":    true,
     "filesystem_access": {
         "permissions": "0xFFFFFFFFFFFFFFFF"
     },
diff --git a/stratosphere/dmnt/dmnt.json b/stratosphere/dmnt/dmnt.json
index 56d5b8f10..3c8f403f9 100644
--- a/stratosphere/dmnt/dmnt.json
+++ b/stratosphere/dmnt/dmnt.json
@@ -11,6 +11,7 @@
 	"pool_partition":	2,
 	"is_64_bit":	true,
 	"address_space_type":	3,
+    "disable_device_address_space_merge":    true,
 	"filesystem_access":	{
 		"permissions":	"0xFFFFFFFFFFFFFFFF"
 	},
diff --git a/stratosphere/eclct.stub/eclct.stub.json b/stratosphere/eclct.stub/eclct.stub.json
index 97c1a16c0..70c563fb5 100644
--- a/stratosphere/eclct.stub/eclct.stub.json
+++ b/stratosphere/eclct.stub/eclct.stub.json
@@ -11,6 +11,7 @@
     "pool_partition":    2,
     "is_64_bit":    true,
     "address_space_type":    3,
+    "disable_device_address_space_merge":    true,
     "filesystem_access":    {
         "permissions":    "0xFFFFFFFFFFFFFFFF"
     },
diff --git a/stratosphere/erpt/erpt.json b/stratosphere/erpt/erpt.json
index ee21a3b37..26713f913 100644
--- a/stratosphere/erpt/erpt.json
+++ b/stratosphere/erpt/erpt.json
@@ -11,6 +11,7 @@
 	"pool_partition":	2,
 	"is_64_bit":	true,
 	"address_space_type":	3,
+    "disable_device_address_space_merge":    true,
 	"filesystem_access":	{
 		"permissions":	"0xFFFFFFFFFFFFFFFF"
 	},
diff --git a/stratosphere/fatal/fatal.json b/stratosphere/fatal/fatal.json
index 166e72d0b..6bb797e95 100644
--- a/stratosphere/fatal/fatal.json
+++ b/stratosphere/fatal/fatal.json
@@ -11,6 +11,7 @@
 	"pool_partition":	2,
 	"is_64_bit":	true,
 	"address_space_type":	3,
+    "disable_device_address_space_merge":    true,
 	"filesystem_access":	{
 		"permissions":	"0xFFFFFFFFFFFFFFFF"
 	},
diff --git a/stratosphere/jpegdec/jpegdec.json b/stratosphere/jpegdec/jpegdec.json
index 43b4fdc07..4ca5c6cea 100644
--- a/stratosphere/jpegdec/jpegdec.json
+++ b/stratosphere/jpegdec/jpegdec.json
@@ -11,6 +11,7 @@
 	"pool_partition":	2,
 	"is_64_bit":	true,
 	"address_space_type":	3,
+    "disable_device_address_space_merge":    true,
 	"filesystem_access":	{
 		"permissions":	"0x0"
 	},
diff --git a/stratosphere/pgl/pgl.json b/stratosphere/pgl/pgl.json
index 4b813d942..406469b0a 100644
--- a/stratosphere/pgl/pgl.json
+++ b/stratosphere/pgl/pgl.json
@@ -11,6 +11,7 @@
 	"pool_partition":	2,
 	"is_64_bit":	true,
 	"address_space_type":	3,
+    "disable_device_address_space_merge":    true,
 	"filesystem_access":	{
 		"permissions":	"0xFFFFFFFFFFFFFFFF"
 	},
diff --git a/stratosphere/ro/ro.json b/stratosphere/ro/ro.json
index bf31dacd4..61f86b430 100644
--- a/stratosphere/ro/ro.json
+++ b/stratosphere/ro/ro.json
@@ -11,6 +11,7 @@
 	"pool_partition":	2,
 	"is_64_bit":	true,
 	"address_space_type":	3,
+    "disable_device_address_space_merge":    true,
 	"filesystem_access":	{
 		"permissions":	"0xFFFFFFFFFFFFFFFF"
 	},