diff --git a/xtask/src/main.rs b/xtask/src/main.rs
index 32adadc60..c886b78ac 100644
--- a/xtask/src/main.rs
+++ b/xtask/src/main.rs
@@ -610,7 +610,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
             //   - [planned] vault application
             let bao_rram_pkgs = ["xous-ticktimer", "xous-log", "xous-names" /* "usb-cramium" */].to_vec(); /* "usb-cramium" */
             let bao_swap_pkgs =
-                ["cram-hal-service", "bao-console", "bao-video", "modals" /* "pddb", "keystore" */].to_vec(); /* "bao-video" */
+                ["cram-hal-service", "bao-console" /* "bao-video", "modals", "pddb", "keystore" */].to_vec(); /* "bao-video" */
             if !builder.is_swap_set() {
                 builder.set_swap(0, 8 * 1024 * 1024);
             }
@@ -621,16 +621,16 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
             builder.add_loader_feature("debug-print");
             // the following feature needs to be uncommented if we also enable
             // debug-print-swapper inside xous-swapper
-            if false {
+            if true {
                 builder.add_loader_feature("userspace-swap-debug");
                 builder.add_feature("debug-print-swapper");
                 // use this to enable debug in USB, when the package is selected
-                builder.add_feature("debug-print-usb");
+                // builder.add_feature("debug-print-usb");
             } else {
             }
             builder.add_kernel_feature("debug-swap");
             // builder.add_kernel_feature("debug-print");
-            // builder.add_kernel_feature("debug-swap-verbose");
+            builder.add_kernel_feature("debug-swap-verbose");
             // builder.add_feature("quantum-timer"); // this isn't in NTO..
             builder.add_kernel_feature("v2p");
             builder.add_loader_feature("sram-margin");