diff --git a/configure b/configure
index c7d78bf1..d6488d25 100755
--- a/configure
+++ b/configure
@@ -189,10 +189,9 @@ else
 	echo "Using compiler $CC"
 fi
 
-[ -z "$DEBUG" ] && DEBUG=yes
 
 echo "CC =	$CC" >>$CONFIG_MK
-echo "CFLAGS =	-O2" >>$CONFIG_MK
+echo "CFLAGS =	-Oz" >>$CONFIG_MK
 
 echo "LDFLAGS =  	-L\$(TOPDIR)/lib" >>$CONFIG_MK
 echo "CPPFLAGS = 	-I. -I\$(TOPDIR) -I\$(TOPDIR)/include" >>$CONFIG_MK
diff --git a/data/Makefile b/data/Makefile
index 8bf94100..c584817a 100644
--- a/data/Makefile
+++ b/data/Makefile
@@ -15,7 +15,7 @@ install:
 	install -m644 xbps.d.5 $(DESTDIR)$(MANDIR)/man5
 	install -d $(DESTDIR)$(PKGCONFIGDIR)
 	install -m644 $(PCFILE) $(DESTDIR)$(PKGCONFIGDIR)
-	install -d $(DESTDIR)/$(DBDIR)/keys
+	-install -d $(DESTDIR)/$(DBDIR)/keys
 	install -m644 *.plist $(DESTDIR)/$(DBDIR)/keys
 	install -d $(DESTDIR)/$(SHAREDIR)/xbps.d
 	install -m644 repod-main.conf $(DESTDIR)/$(SHAREDIR)/xbps.d/00-repository-main.conf
diff --git a/lib/Makefile b/lib/Makefile
index 0cf6ac84..e2a8ce92 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -94,7 +94,7 @@ libxbps.a: $(LIBFETCH_OBJS) $(LIBPROP_OBJS) $(OBJS)
 
 .PHONY: install
 install: all
-	install -d $(DESTDIR)$(LIBDIR)
+	-install -d $(DESTDIR)$(LIBDIR)
 	install -m 644 libxbps.a $(DESTDIR)$(LIBDIR)
 	install -m 755 $(LIBXBPS_SHLIB) $(DESTDIR)$(LIBDIR)
 	cp -a libxbps.so $(DESTDIR)$(LIBDIR)
diff --git a/lib/verifysig.c b/lib/verifysig.c
index b8b8f4c2..6d465505 100644
--- a/lib/verifysig.c
+++ b/lib/verifysig.c
@@ -31,6 +31,7 @@
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <sys/mman.h>
+#include <linux/limits.h>
 
 #include <openssl/err.h>
 #include <openssl/sha.h>
diff --git a/mk/prog.mk b/mk/prog.mk
index 82ba82b5..b64fc948 100644
--- a/mk/prog.mk
+++ b/mk/prog.mk
@@ -22,7 +22,7 @@ clean:
 
 .PHONY: install
 install: all
-	install -d $(DESTDIR)$(SBINDIR)
+	-install -d $(DESTDIR)$(SBINDIR)
 	install -m 755 $(BIN) $(DESTDIR)$(SBINDIR)
 ifdef BUILD_STATIC
 	install -m 755 $(BIN).static $(DESTDIR)$(SBINDIR)