diff --git a/m4/pandora_have_libcpprest.m4 b/m4/pandora_have_libcpprest.m4
index 2d05e63..5c8d1b9 100644
--- a/m4/pandora_have_libcpprest.m4
+++ b/m4/pandora_have_libcpprest.m4
@@ -29,8 +29,6 @@ AC_DEFUN([_PANDORA_SEARCH_LIBCPPREST],[
 web::http::client::http_client client("http://example.com/");
     ])
     CXXFLAGS="${save_CXXFLAGS}"
-    LIBCPPREST="${LIBCPPREST} ${PTHREAD_LIBS}"
-    LTLIBCPPREST="${LTLIBCPPREST} ${PTHREAD_LIBS}"
     AC_LANG_POP()
   ],[
     ac_cv_libcpprest="no"
diff --git a/m4/pandora_warnings.m4 b/m4/pandora_warnings.m4
index cd18a19..38a4281 100644
--- a/m4/pandora_warnings.m4
+++ b/m4/pandora_warnings.m4
@@ -185,8 +185,8 @@ foo();
            [ac_cv_safe_to_use_wformat_=no])
          CFLAGS="$save_CFLAGS"])
       AS_IF([test "$ac_cv_safe_to_use_wformat_" = "yes"],[
-        BASE_WARNINGS="${BASE_WARNINGS} -Wformat -Wno-format-nonliteral -Wno-format-security"
-        BASE_WARNINGS_FULL="${BASE_WARNINGS_FULL} -Wformat=2 -Wno-format-nonliteral -Wno-format-security"
+        BASE_WARNINGS="${BASE_WARNINGS} -Wformat=2"
+        BASE_WARNINGS_FULL="${BASE_WARNINGS_FULL} -Wformat=2"
         ],[
         BASE_WARNINGS="${BASE_WARNINGS} -Wno-format"
         BASE_WARNINGS_FULL="${BASE_WARNINGS_FULL} -Wno-format"
@@ -238,7 +238,7 @@ uint16_t x= htons(80);
       ])
 
       CC_WARNINGS="${BASE_WARNINGS} -Wstrict-prototypes -Wmissing-prototypes -Wredundant-decls -Wmissing-declarations -Wcast-align ${CC_WARNINGS_FULL}"
-      CXX_WARNINGS="${BASE_WARNINGS} -Woverloaded-virtual -Wnon-virtual-dtor -Wctor-dtor-privacy -Wno-long-long ${CXX_WARNINGS_FULL}"
+      CXX_WARNINGS="${BASE_WARNINGS} -Woverloaded-virtual -Wnon-virtual-dtor -Wctor-dtor-privacy ${CXX_WARNINGS_FULL}"
 
       AC_CACHE_CHECK([whether it is safe to use -Wmissing-declarations from C++],
         [ac_cv_safe_to_use_Wmissing_declarations_],