diff --git a/Makefile b/Makefile
index 4c0a92b..a39b53c 100644
--- a/Makefile
+++ b/Makefile
@@ -16,8 +16,8 @@ ARFLAGS		=	cr
 CC		=	cc
 CFLAGS		=
 CODESIGN_IDENTITY =	Developer ID
-#COMMONFLAGS	=	-Os -g
-COMMONFLAGS	=	-O0 -g -fsanitize=address
+COMMONFLAGS	=	-Os -g
+#COMMONFLAGS	=	-O0 -g -fsanitize=address
 CPPFLAGS	=	'-DPDFIO_VERSION="$(VERSION)"'
 DESTDIR		=	$(DSTROOT)
 DSO		=	cc
@@ -160,8 +160,7 @@ testpdfio:		testpdfio.o libpdfio.a
 
 
 # Dependencies
-$(OBJS):		pdfio.h Makefile
-$(LIBOBJS):		pdfio-private.h
+$(OBJS):		pdfio.h pdfio-private.h Makefile
 pdfio-content.o:	pdfio-content.h ttf.h
 ttf.o:			ttf.h
 
diff --git a/testpdfio.c b/testpdfio.c
index 79e9754..7c06f07 100644
--- a/testpdfio.c
+++ b/testpdfio.c
@@ -971,7 +971,7 @@ do_unit_tests(void)
   fputs("_pdfioValueRead(complex_dict): ", stdout);
   s = complex_dict;
   _pdfioTokenInit(&tb, inpdf, (_pdfio_tconsume_cb_t)token_consume_cb, (_pdfio_tpeek_cb_t)token_peek_cb, (void *)&s);
-  if (_pdfioValueRead(inpdf, NULL, &tb, &value))
+  if (_pdfioValueRead(inpdf, NULL, &tb, &value, 0))
   {
     // TODO: Check value...
     fputs("PASS: ", stdout);
@@ -985,7 +985,7 @@ do_unit_tests(void)
   fputs("_pdfioValueRead(cid_dict): ", stdout);
   s = cid_dict;
   _pdfioTokenInit(&tb, inpdf, (_pdfio_tconsume_cb_t)token_consume_cb, (_pdfio_tpeek_cb_t)token_peek_cb, (void *)&s);
-  if (_pdfioValueRead(inpdf, NULL, &tb, &value))
+  if (_pdfioValueRead(inpdf, NULL, &tb, &value, 0))
   {
     // TODO: Check value...
     fputs("PASS: ", stdout);