diff --git a/modules/spl/spl-debug.c b/modules/spl/spl-debug.c
index d2b96b0c34..df22cbc487 100644
--- a/modules/spl/spl-debug.c
+++ b/modules/spl/spl-debug.c
@@ -1118,8 +1118,10 @@ void spl_debug_bug(char *file, const char *func, const int line, int flags)
          if (spl_debug_panic_on_bug)
                 spl_panic_in_progress = 1;
 
+#ifdef DEBUG
         spl_debug_dumpstack(NULL);
         spl_debug_dumplog(flags);
+#endif
 
         if (spl_debug_panic_on_bug)
                 panic("SBUG");
diff --git a/modules/spl/spl-taskq.c b/modules/spl/spl-taskq.c
index dc6959db55..799b54839c 100644
--- a/modules/spl/spl-taskq.c
+++ b/modules/spl/spl-taskq.c
@@ -475,7 +475,7 @@ spl_taskq_init(void)
         ENTRY;
 
         system_taskq = taskq_create("system_taskq", 64, minclsyspri, 4, 512,
-                                    TASKQ_DYNAMIC | TASKQ_PREPOPULATE);
+                                    TASKQ_PREPOPULATE);
 	if (system_taskq == NULL)
 		RETURN(1);