diff --git a/archive/wavpack_helper.c b/archive/wavpack_helper.c
index 8142d22..2d90fca 100644
--- a/archive/wavpack_helper.c
+++ b/archive/wavpack_helper.c
@@ -224,7 +224,7 @@ pack_audio(WavpackContext *wpc, read_data *rdat)
 	uint32_t samples_remaining, input_samples = INPUT_SAMPLES, samples_read = 0;
 	int bytes_per_sample;
 	int32_t *sample_buffer;
-	unsigned char *input_buffer;
+	unsigned char *input_buffer = NULL; // Silence compiler
 
 	// don't use an absurd amount of memory just because we have an absurd number of channels
 
diff --git a/filters/delta2/delta2.c b/filters/delta2/delta2.c
index 3503a88..675a214 100644
--- a/filters/delta2/delta2.c
+++ b/filters/delta2/delta2.c
@@ -110,7 +110,8 @@ static int delta2_encode_real(uchar_t *src, uint64_t srclen, uchar_t *dst, uint6
  * buffer then delta encoding is aborted.
  */
 int
-delta2_encode(uchar_t *src, uint64_t srclen, uchar_t *dst, uint64_t *dstlen, int rle_thresh, int nstrides)
+delta2_encode(uchar_t *src, uint64_t srclen, uchar_t *dst, uint64_t *dstlen,
+	      int rle_thresh, int nstrides)
 {
 	if (srclen > MAX_THRESH) {
 		DEBUG_STAT_EN(fprintf(stderr, "DELTA2: srclen: %" PRIu64 " is too big.\n", srclen));
@@ -135,7 +136,8 @@ delta2_encode(uchar_t *src, uint64_t srclen, uchar_t *dst, uint64_t *dstlen, int
 		if (rv == -1)
 			return (rv);
 		*dstlen += MAIN_HDR;
-		DEBUG_STAT_EN(fprintf(stderr, "DELTA2: srclen: %" PRIu64 ", dstlen: %" PRIu64 "\n", srclen, *dstlen));
+		DEBUG_STAT_EN(fprintf(stderr, "DELTA2: srclen: %" PRIu64 ", dstlen: %" PRIu64 "\n",
+				      srclen, *dstlen));
 		DEBUG_STAT_EN(fprintf(stderr, "DELTA2: header overhead: %d\n", hdr_ovr));
 	} else {
 		uchar_t *srcpos, *dstpos, *lastdst, *lastsrc, *dstend;
@@ -205,9 +207,11 @@ delta2_encode(uchar_t *src, uint64_t srclen, uchar_t *dst, uint64_t *dstlen, int
 		}
 		*dstlen = dstpos - dst;
 		DEBUG_STAT_EN(en = get_wtime_millis());
-		DEBUG_STAT_EN(fprintf(stderr, "DELTA2: srclen: %" PRIu64 ", dstlen: %" PRIu64 "\n", srclen, *dstlen));
+		DEBUG_STAT_EN(fprintf(stderr, "DELTA2: srclen: %" PRIu64 ", dstlen: %" PRIu64 "\n",
+				      srclen, *dstlen));
 		DEBUG_STAT_EN(fprintf(stderr, "DELTA2: header overhead: %d\n", hdr_ovr));
-		DEBUG_STAT_EN(fprintf(stderr, "DELTA2: Processed at %.3f MB/s\n", get_mb_s(srclen, strt, en)));
+		DEBUG_STAT_EN(fprintf(stderr, "DELTA2: Processed at %.3f MB/s\n",
+				      get_mb_s(srclen, strt, en)));
 	}
 	return (0);
 }
diff --git a/filters/dispack/dis.cpp b/filters/dispack/dis.cpp
index 3369a37..9273435 100644
--- a/filters/dispack/dis.cpp
+++ b/filters/dispack/dis.cpp
@@ -1014,7 +1014,7 @@ Inverse_E89(uint8_t *src, uint64_t sz)
  * a block contains valid x86 code by trying to estimate some instruction metrics.
  */
 int
-dispack_encode(uchar_t *from, uint64_t fromlen, uchar_t *to, uint64_t *dstlen, int stype)
+dispack_encode(uchar_t *from, uint64_t fromlen, uchar_t *to, uint64_t *dstlen)
 {
 	uchar_t *pos, *hdr, type, *pos_to, *to_last;
 	sU32 len;
diff --git a/filters/dispack/dis.hpp b/filters/dispack/dis.hpp
index b468a8f..73c8da7 100644
--- a/filters/dispack/dis.hpp
+++ b/filters/dispack/dis.hpp
@@ -31,8 +31,7 @@
 extern "C" {
 #endif
 
-int dispack_encode(uchar_t *from, uint64_t fromlen, uchar_t *to, uint64_t *_dstlen,
-    int stype);
+int dispack_encode(uchar_t *from, uint64_t fromlen, uchar_t *to, uint64_t *_dstlen);
 int dispack_decode(uchar_t *from, uint64_t fromlen, uchar_t *to, uint64_t *dstlen);
 
 int Forward_E89(uint8_t *src, uint64_t sz);
diff --git a/meta_stream.c b/meta_stream.c
index b22c335..67ab0a0 100644
--- a/meta_stream.c
+++ b/meta_stream.c
@@ -41,7 +41,7 @@
 #include "allocator.h"
 #include "meta_stream.h"
 
-#define	METADATA_CHUNK_SIZE	(2 * 1024 * 1024)
+#define	METADATA_CHUNK_SIZE	(3 * 1024 * 1024)
 
 extern int bzip2_compress(void *src, uint64_t srclen, void *dst, uint64_t *dstlen,
                int level, uchar_t chdr, int btype, void *data);
diff --git a/utils/phash/extensions.h b/utils/phash/extensions.h
index cea6b4e..6d6a98c 100644
--- a/utils/phash/extensions.h
+++ b/utils/phash/extensions.h
@@ -86,7 +86,7 @@ struct ext_entry {
 	{"bib"	, TYPE_TEXT,        3},
 	{"lua"	, TYPE_TEXT,        3},
 	{"nse"	, TYPE_TEXT,        3},
-	{"dtd"	, TYPE_TEXT,        3},
+	{"dtd"	, TYPE_TEXT|TYPE_MARKUP,        3},
 	{"qml"	, TYPE_TEXT|TYPE_MARKUP,        3},
 	{"fa"	, TYPE_TEXT|TYPE_DNA_SEQ,        2},
 	{"faa"	, TYPE_TEXT|TYPE_DNA_SEQ,        3},
diff --git a/utils/phash/extensions.txt b/utils/phash/extensions.txt
index 3c5bb8a..04a43c1 100644
--- a/utils/phash/extensions.txt
+++ b/utils/phash/extensions.txt
@@ -73,7 +73,7 @@ ps,TYPE_TEXT
 bib,TYPE_TEXT
 lua,TYPE_TEXT
 nse,TYPE_TEXT
-dtd,TYPE_TEXT
+dtd,TYPE_TEXT|TYPE_MARKUP
 qml,TYPE_TEXT|TYPE_MARKUP
 
 # These are all genomic data file extensions
diff --git a/utils/utils.h b/utils/utils.h
index 058fec9..e1bf39d 100644
--- a/utils/utils.h
+++ b/utils/utils.h
@@ -193,7 +193,7 @@ typedef int32_t bsize_t;
 
 #ifdef __APPLE__
 #define	CLOCK_MONOTONIC 0
-#define CLOCK_REALTIME  1
+#define	CLOCK_REALTIME  1
 #endif
 
 /*