diff --git a/aucat/defs.h b/aucat/defs.h
index 6cfc877..0b7439d 100644
--- a/aucat/defs.h
+++ b/aucat/defs.h
@@ -20,7 +20,7 @@
 /*
  * limits
  */
-#define NCHAN_MAX	16		/* max channel in a stream */
+#define NCHAN_MAX	64		/* max channel in a stream */
 #define RATE_MIN	4000		/* min sample rate */
 #define RATE_MAX	192000		/* max sample rate */
 #define BITS_MIN	1		/* min bits per sample */
diff --git a/libsndio/sio_alsa.c b/libsndio/sio_alsa.c
index d8df57f..4c47ea6 100644
--- a/libsndio/sio_alsa.c
+++ b/libsndio/sio_alsa.c
@@ -489,8 +489,10 @@ sio_alsa_xrun(struct sio_alsa_hdl *hdl)
 	int wbpf;
 
 	DPRINTFN(2, "sio_alsa_xrun:\n");
+#ifdef DEBUG
 	if (_sndio_debug >= 2)
 		_sio_printpos(&hdl->sio);
+#endif
 
 	/*
 	 * we assume rused/wused are zero if rec/play modes are not
diff --git a/libsndio/sio_oss.c b/libsndio/sio_oss.c
index 5687f85..6a171c1 100644
--- a/libsndio/sio_oss.c
+++ b/libsndio/sio_oss.c
@@ -665,8 +665,10 @@ sio_oss_xrun(struct sio_oss_hdl *hdl)
 	int wbpf;
 
 	DPRINTFN(2, "sio_oss_xrun:\n");
+#ifdef DEBUG
 	if (_sndio_debug >= 2)
 		_sio_printpos(&hdl->sio);
+#endif
 
 	/*
 	 * we assume rused/wused are zero if rec/play modes are not
diff --git a/sndiod/defs.h b/sndiod/defs.h
index a5086e2..a341a44 100644
--- a/sndiod/defs.h
+++ b/sndiod/defs.h
@@ -54,7 +54,7 @@
 /*
  * limits
  */
-#define NCHAN_MAX	16		/* max channel in a stream */
+#define NCHAN_MAX	64		/* max channel in a stream */
 #define RATE_MIN	4000		/* min sample rate */
 #define RATE_MAX	192000		/* max sample rate */
 #define BITS_MIN	1		/* min bits per sample */