diff --git a/src/common/unordered_defs.h b/src/common/unordered_defs.h
index 81e2d08f..e82ae0c6 100644
--- a/src/common/unordered_defs.h
+++ b/src/common/unordered_defs.h
@@ -4,18 +4,16 @@
 #ifdef  HAVE_CXX0X_UNORDERED
 #  include <unordered_map>
 #  include <unordered_set>
-using std::tr1::unordered_map;
-using std::tr1::unordered_set;
-#define STD_UNORDERED_MAP std::unordered_map
-#define STD_UNORDERED_SET std::unordered_set
+#  define STD_UNORDERED_MAP std::unordered_map
+#  define STD_UNORDERED_SET std::unordered_set
 #elif defined(HAVE_TR1_UNORDERED)
 #  include <tr1/unordered_map>
 #  include <tr1/unordered_set>
-#define STD_UNORDERED_MAP std::tr1::unordered_map
-#define STD_UNORDERED_SET std::tr1::unordered_set
+#  define STD_UNORDERED_MAP std::tr1::unordered_map
+#  define STD_UNORDERED_SET std::tr1::unordered_set
 #else
 #  include <map>
 #  include <set>
-#define STD_UNORDERED_MAP std::map
-#define STD_UNORDERED_SET std::set
+#  define STD_UNORDERED_MAP std::map
+#  define STD_UNORDERED_SET std::set
 #endif
diff --git a/src/internfile/mimehandler.cpp b/src/internfile/mimehandler.cpp
index 3b2b2681..664be028 100644
--- a/src/internfile/mimehandler.cpp
+++ b/src/internfile/mimehandler.cpp
@@ -127,7 +127,7 @@ void clearMimeHandlerCache()
 {
     LOGDEB(("clearMimeHandlerCache()\n"));
     typedef multimap<string, RecollFilter*>::value_type value_type;
-    map<string, RecollFilter *>::iterator it;
+    multimap<string, RecollFilter *>::iterator it;
     PTMutexLocker locker(o_handlers_mutex);
     for (it = o_handlers.begin(); it != o_handlers.end(); it++) {
 	delete it->second;
diff --git a/src/lib/Makefile b/src/lib/Makefile
index 5926d8d9..9f8bbd00 100644
--- a/src/lib/Makefile
+++ b/src/lib/Makefile
@@ -19,7 +19,7 @@ librecoll.a : $(DEPS) $(OBJS)
 # no effort whatsoever to maintain any kind of ABI compat in this lib. Only
 # programs or modules from the same Recoll release can be compatible.
 $(LIBRECOLL): $(DEPS) $(OBJS)
-	g++ -shared -Wl,--no-undefined -Wl,--warn-unresolved-symbols           -Wl,-soname=$(LIBRECOLL) -o $(LIBRECOLL) $(OBJS)            $(LIBXAPIAN) $(LIBICONV) $(X_LIBX11) $(LIBSYS)
+	$(CXX) -shared -Wl,--no-undefined -Wl,--warn-unresolved-symbols           -Wl,-soname=$(LIBRECOLL) -o $(LIBRECOLL) $(OBJS)            $(LIBXAPIAN) $(LIBICONV) $(X_LIBX11) $(LIBSYS)
 	rm -f librecoll.so
 	ln -s $(LIBRECOLL) librecoll.so
 
diff --git a/src/lib/mkMake b/src/lib/mkMake
index 9ebb8576..216cc4c3 100755
--- a/src/lib/mkMake
+++ b/src/lib/mkMake
@@ -143,7 +143,7 @@ librecoll.a : \$(DEPS) \$(OBJS)
 # no effort whatsoever to maintain any kind of ABI compat in this lib. Only
 # programs or modules from the same Recoll release can be compatible.
 \$(LIBRECOLL): \$(DEPS) \$(OBJS)
-	g++ -shared -Wl,--no-undefined -Wl,--warn-unresolved-symbols \
+	\$(CXX) -shared -Wl,--no-undefined -Wl,--warn-unresolved-symbols \
           -Wl,-soname=\$(LIBRECOLL) -o \$(LIBRECOLL) \$(OBJS) \
            \$(LIBXAPIAN) \$(LIBICONV) \$(X_LIBX11) \$(LIBSYS)
 	rm -f librecoll.so
diff --git a/src/mk/FreeBSD b/src/mk/FreeBSD
index e0f0c720..e5df10bd 100644
--- a/src/mk/FreeBSD
+++ b/src/mk/FreeBSD
@@ -2,4 +2,4 @@ include $(depth)/mk/commondefs
 include $(depth)/mk/localdefs
 
 ALL_CXXFLAGS = $(CXXFLAGS) $(COMMONCXXFLAGS) $(LOCALCXXFLAGS) -pthread 
-LIBSYS = -lz
+LIBSYS = -pthread -lz
diff --git a/src/rcldb/rclabstract.cpp b/src/rcldb/rclabstract.cpp
index b18c6f75..98b2cb3d 100644
--- a/src/rcldb/rclabstract.cpp
+++ b/src/rcldb/rclabstract.cpp
@@ -283,7 +283,7 @@ int Query::Native::getFirstMatchPage(Xapian::docid docid, string& term)
     multimap<double, vector<string> > byQ;
     double totalweight = qualityTerms(docid, terms, byQ);
 
-    for (map<double, vector<string> >::reverse_iterator mit = byQ.rbegin(); 
+    for (multimap<double, vector<string> >::reverse_iterator mit = byQ.rbegin(); 
 	 mit != byQ.rend(); mit++) {
 	for (vector<string>::const_iterator qit = mit->second.begin();
 	     qit != mit->second.end(); qit++) {
@@ -384,7 +384,7 @@ int Query::Native::makeAbstract(Xapian::docid docid,
     int ret = ABSRES_OK;
 
     // Let's go populate
-    for (map<double, vector<string> >::reverse_iterator mit = byQ.rbegin(); 
+    for (multimap<double, vector<string> >::reverse_iterator mit = byQ.rbegin(); 
 	 mit != byQ.rend(); mit++) {
 	unsigned int maxgrpoccs;
 	float q;
diff --git a/src/utils/pxattr.cpp b/src/utils/pxattr.cpp
index 8b451b9d..865844d0 100644
--- a/src/utils/pxattr.cpp
+++ b/src/utils/pxattr.cpp
@@ -326,6 +326,7 @@ list(int fd, const string& path, vector<string>* names, flags flags, nspace dom)
 	return false;
     if (!buf.alloc(ret+1)) // NEEDED on FreeBSD (no ending null)
 	return false;
+    buf.buf[ret] = 0;
     if (fd < 0) {
 	if (flags & PXATTR_NOFOLLOW) {
 	    ret = extattr_list_link(path.c_str(), EXTATTR_NAMESPACE_USER,