diff --git a/Makefile.am b/Makefile.am
index 825c3c37..02a96a57 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -702,6 +702,11 @@ if !ON_LINUX
 XFAIL_TESTS += tests/test_abstract_ipc
 endif
 
+if ON_GNU
+XFAIL_TESTS += test_ipc_wildcard \
+		test_term_endpoint
+endif
+
 EXTRA_DIST = \
 	CMakeLists.txt \
 	autogen.sh	\
diff --git a/configure.ac b/configure.ac
index 589f90df..cbc40178 100644
--- a/configure.ac
+++ b/configure.ac
@@ -146,20 +146,6 @@ CPPFLAGS="-D_REENTRANT -D_THREAD_SAFE $CPPFLAGS"
 # For host type checks
 AC_CANONICAL_HOST
 
-#For a working getsockopt() optname=SO_ERROR
-dnl AC_MSG_CHECKING([for getsockopt optname SO_ERROR)])
-dnl AC_TRY_COMPILE([
-dnl #include <sys/types.h>
-dnl #include <sys/socket.h>
-dnl ], [socklen_t t;], ac_cv_type_socklen_t=yes, ac_cv_type_socklen_t=no)
-dnl if test "x$ac_cv_type_socklen_t" = "xyes"; then
-dnl AC_MSG_RESULT([yes])
-dnl AC_DEFINE(HAVE_SOCKLEN_T,1,
-dnl   [Define if socklen_t is available])
-dnl   else
-dnl   AC_MSG_RESULT([no])
-dnl   fi
-
 # OS-specific tests
 case "${host_os}" in
     *linux*)
@@ -304,8 +290,6 @@ case "${host_os}" in
         AC_DEFINE(ZMQ_HAVE_GNU, 1, [Have GNU/Hurd OS])
         libzmq_on_gnu="yes"
 	AC_CHECK_LIB(rt, sem_init)
-dnl        AC_CHECK_LIB(uuid, uuid_generate, ,
-dnl            [AC_MSG_ERROR([cannot link with -luuid, install uuid-dev.])])
         ;;
     *)
         AC_MSG_ERROR([unsupported system: ${host_os}.])
diff --git a/src/poller.hpp b/src/poller.hpp
index f3d8d676..a87d5094 100644
--- a/src/poller.hpp
+++ b/src/poller.hpp
@@ -49,12 +49,8 @@
 #elif defined ZMQ_USE_SELECT
 #include "select.hpp"
 #elif defined ZMQ_HAVE_GNU
-#define ZMQ_USE_SELECT
-#include "select.hpp"
-#if 0
 #define ZMQ_USE_POLL
 #include "poll.hpp"
-#endif
 #else
 #error None of the ZMQ_USE_* macros defined
 #endif
diff --git a/src/thread.cpp b/src/thread.cpp
index d013737d..1386b71e 100644
--- a/src/thread.cpp
+++ b/src/thread.cpp
@@ -114,7 +114,7 @@ void zmq::thread_t::stop ()
 
 void zmq::thread_t::setSchedulingParameters(int priority_, int schedulingPolicy_)
 {
-#if !defined ZMQ_HAVE_ZOS && !defined ZMQ_HAVE_HPUX
+#if !defined ZMQ_HAVE_ZOS && !defined ZMQ_HAVE_HPUX && !defined ZMQ_HAVE_GNU
     int policy = 0;
     struct sched_param param;