diff --git a/Makefile b/Makefile
index 9c94cfe..8f0573c 100644
--- a/Makefile
+++ b/Makefile
@@ -91,7 +91,7 @@ endif
 
 
 DEFINES = 
-CFLAGS = -g -ggdb $(FLAGS2) $(INCLUDES) $(DEFINES) -Wall -O2
+CFLAGS = $(FLAGS2) $(INCLUDES) $(DEFINES) -Wall -Os
 .SUFFIXES: .c .cpp
 
 all: bin/masscan 
diff --git a/src/main.c b/src/main.c
index 3a9e789..0791b86 100644
--- a/src/main.c
+++ b/src/main.c
@@ -54,7 +54,7 @@
 #include "siphash24.h"
 #include "proto-x509.h"
 #include "crypto-base64.h"      /* base64 encode/decode */
-#include "pixie-backtrace.h"
+//#include "pixie-backtrace.h"
 #include "proto-sctp.h"
 #include "proto-oproto.h"       /* Other protocols on top of IP */
 #include "vulncheck.h"          /* checking vulns like monlist, poodle, heartblee */
@@ -1571,6 +1571,7 @@ int main(int argc, char *argv[])
     global_now = time(0);
 
     /* Set system to report debug information on crash */
+/*
     {
         int is_backtrace = 1;
         for (i=1; i<(unsigned)argc; i++) {
@@ -1580,6 +1581,7 @@ int main(int argc, char *argv[])
         if (is_backtrace)
             pixie_backtrace_init(argv[0]);
     }
+*/
     
     /*
      * Initialize those defaults that aren't zero
diff --git a/src/stub-pcap.c b/src/stub-pcap.c
index d93554f..4f05dd7 100644
--- a/src/stub-pcap.c
+++ b/src/stub-pcap.c
@@ -374,6 +374,7 @@ if (pl->datalink == NULL) pl->func_err=1, pl->datalink = null_##PCAP_DATALINK;
             "libpcap.so.0.9.5",
             "libpcap.so.0.9.4",
             "libpcap.so.0.8",
+            "libpcap.so.1.7.4",
             0
         };
         unsigned i;