diff --git a/configure b/configure
index 7b2226f7..c5265429 100755
--- a/configure
+++ b/configure
@@ -25679,14 +25679,14 @@ $as_echo "$enable_zip" >&6; }
 
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if tdb library is wanted" >&5
 $as_echo_n "checking if tdb library is wanted... " >&6; }
-   if test "$USP_FLAGS" = "-DAS_cpoll_cppsp_DO"; then
-		wanted=0;
-   else
-		wanted=1;
-   fi
+	wanted=1;
 	if test -z "$with_libtdb" ; then
 		wanted=0;
-		with_libtdb="${CROSS_ENVIRONMENT}/usr";
+		if test "$USP_FLAGS" = "-DAS_cpoll_cppsp_DO"; then
+			with_libtdb="no";
+		else
+			with_libtdb="${CROSS_ENVIRONMENT}/usr";
+		fi
 	fi
 
 # Check whether --with-libtdb was given.
@@ -25740,14 +25740,14 @@ fi
 
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if zopfli library is wanted" >&5
 $as_echo_n "checking if zopfli library is wanted... " >&6; }
-   if test "$USP_FLAGS" = "-DAS_cpoll_cppsp_DO"; then
-		wanted=0;
-   else
-		wanted=1;
-   fi
+	wanted=1;
 	if test -z "$with_libzopfli" ; then
 		wanted=0;
-		with_libzopfli="${CROSS_ENVIRONMENT}/usr";
+		if test "$USP_FLAGS" = "-DAS_cpoll_cppsp_DO"; then
+			with_libzopfli="no";
+		else
+			with_libzopfli="${CROSS_ENVIRONMENT}/usr";
+		fi
 	fi
 
 # Check whether --with-libzopfli was given.
diff --git a/m4/ac_check_package.m4 b/m4/ac_check_package.m4
index 4df8e2f1..d05d44d9 100644
--- a/m4/ac_check_package.m4
+++ b/m4/ac_check_package.m4
@@ -56,14 +56,14 @@ AC_DEFUN([AC_CHECK_PACKAGE],[
 	AC_MSG_RESULT([$enable_zip])
 
 	AC_MSG_CHECKING(if tdb library is wanted)
-   if test "$USP_FLAGS" = "-DAS_cpoll_cppsp_DO"; then
-		wanted=0;
-   else
-		wanted=1;
-   fi
+	wanted=1;
 	if test -z "$with_libtdb" ; then
 		wanted=0;
-		with_libtdb="${CROSS_ENVIRONMENT}/usr";
+		if test "$USP_FLAGS" = "-DAS_cpoll_cppsp_DO"; then
+			with_libtdb="no";
+		else
+			with_libtdb="${CROSS_ENVIRONMENT}/usr";
+		fi
 	fi
 	AC_ARG_WITH(libtdb,    [  --with-libtdb           use system      tdb library - [[will check /usr /usr/local]] [[default=use if present]]], [
 	if test "$withval" = "no"; then
@@ -103,14 +103,14 @@ AC_DEFUN([AC_CHECK_PACKAGE],[
 	], [AC_MSG_RESULT(no)])
 
 	AC_MSG_CHECKING(if zopfli library is wanted)
-   if test "$USP_FLAGS" = "-DAS_cpoll_cppsp_DO"; then
-		wanted=0;
-   else
-		wanted=1;
-   fi
+	wanted=1;
 	if test -z "$with_libzopfli" ; then
 		wanted=0;
-		with_libzopfli="${CROSS_ENVIRONMENT}/usr";
+		if test "$USP_FLAGS" = "-DAS_cpoll_cppsp_DO"; then
+			with_libzopfli="no";
+		else
+			with_libzopfli="${CROSS_ENVIRONMENT}/usr";
+		fi
 	fi
 	AC_ARG_WITH(libzopfli, [  --with-libzopfli        use system   zopfli library - [[will check /usr /usr/local]] [[default=use if present]]], [
 	if test "$withval" = "no"; then
diff --git a/src/ulib/net/client/mongodb.cpp b/src/ulib/net/client/mongodb.cpp
index 7c63e12d..c527c797 100644
--- a/src/ulib/net/client/mongodb.cpp
+++ b/src/ulib/net/client/mongodb.cpp
@@ -96,7 +96,7 @@ void UMongoDBClient::readFromCursor()
       vitem.push(x);
       }
 
-   if (U_SYSCALL(mongoc_cursor_error, "%p,%p", cursor, &error)) U_WARNING("mongoc_cursor_error(): %S", error.message);
+   if (U_SYSCALL(mongoc_cursor_error, "%p,%p", cursor, &error)) U_WARNING("mongoc_cursor_error(): %d.%d,%S", error.domain, error.code, error.message);
 
    U_SYSCALL_VOID(mongoc_cursor_destroy, "%p", cursor);
 }
@@ -173,7 +173,7 @@ bool UMongoDBClient::findOne(const char* json, uint32_t len)
       U_RETURN(result);
       }
 
-   U_WARNING("bson_new_from_json(): %S", error.message);
+   U_WARNING("bson_new_from_json(): %d.%d,%S", error.domain, error.code, error.message);
 
    U_RETURN(false);
 }
@@ -189,7 +189,7 @@ bool UMongoDBClient::insert(bson_t* doc)
 
    if (U_SYSCALL(mongoc_collection_insert, "%p,%p,%p,%p,%p,%b,%b,%b,%p,%p", collection, MONGOC_INSERT_NONE, doc, 0, &error) == 0)
       {
-      U_WARNING("mongoc_collection_insert(): %", error.message);
+      U_WARNING("mongoc_collection_insert(): %d.%d,%S", error.domain, error.code, error.message);
 
       U_RETURN(false);
       }
@@ -208,7 +208,7 @@ bool UMongoDBClient::update(bson_t* query, bson_t* _update)
 
    if (U_SYSCALL(mongoc_collection_update, "%p,%d,%p,%p,%p,%p", collection, MONGOC_UPDATE_NONE, query, _update, 0, &error) == 0)
       {
-      U_WARNING("mongoc_collection_update(): %S", error.message);
+      U_WARNING("mongoc_collection_update(): %d.%d,%S", error.domain, error.code, error.message);
 
       U_RETURN(false);
       }
@@ -264,7 +264,7 @@ bool UMongoDBClient::findAndModify(bson_t* query, bson_t* _update)
       U_RETURN(true);
       }
 
-   U_WARNING("mongoc_collection_find_and_modify(): %S", error.message);
+   U_WARNING("mongoc_collection_find_and_modify(): %d.%d,%S", error.domain, error.code, error.message);
 
    U_RETURN(false);
 }
@@ -321,7 +321,7 @@ bool UMongoDBClient::executeBulk(mongoc_bulk_operation_t* bulk)
 
    if (ok) U_RETURN(true);
 
-   U_WARNING("mongoc_bulk_operation_execute(): %S", error.message);
+   U_WARNING("mongoc_bulk_operation_execute(): %d.%d,%S", error.domain, error.code, error.message);
 
    U_RETURN(false);
 }