diff --git a/acinclude.m4 b/acinclude.m4
index 537be183..19d6a2a6 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -629,17 +629,20 @@ dnl # LIBZMQ_CHECK_POLLER_EPOLL([action-if-found], [action-if-not-found])
 dnl # Checks epoll polling system                                                  #
 dnl ################################################################################
 AC_DEFUN([LIBZMQ_CHECK_POLLER_EPOLL], [{
-    AC_LINK_IFELSE(
+    AC_RUN_IFELSE(
         [AC_LANG_PROGRAM(
         [
 #include <sys/epoll.h>
         ],
 [[
 struct epoll_event t_ev;
-epoll_create(10);
+int r;
+r = epoll_create(10);
+return(r < 0);
 ]]
         )],
         [libzmq_cv_have_poller_epoll="yes" ; $1],
+        [libzmq_cv_have_poller_epoll="no" ; $2],
         [libzmq_cv_have_poller_epoll="no" ; $2])
 }])
 
diff --git a/src/blob.hpp b/src/blob.hpp
index b8039c4c..a2edf11f 100644
--- a/src/blob.hpp
+++ b/src/blob.hpp
@@ -23,6 +23,100 @@
 
 #include <string>
 
+// Borrowed from id3lib_strings.h:
+// They seem to be doing something for MSC, but since I only have gcc, I'll just do that
+// Assuming this is uneccessary on GCC 4
+// #if (defined(__GNUC__) && (__GNUC__ >= 3) || (defined(_MSC_VER) && _MSC_VER > 1000))
+#if (defined(__GNUC__) && (__GNUC__ >= 3) && (__GNUC__ <= 4))
+namespace std
+{
+  template<>
+    struct char_traits<unsigned char>
+    {
+      typedef unsigned char char_type;
+      // Unsigned as wint_t in unsigned.
+      typedef unsigned long  	int_type;
+      typedef streampos 	pos_type;
+      typedef streamoff 	off_type;
+      typedef mbstate_t 	state_type;
+
+      static void
+      assign(char_type& __c1, const char_type& __c2)
+      { __c1 = __c2; }
+
+      static bool
+      eq(const char_type& __c1, const char_type& __c2)
+      { return __c1 == __c2; }
+
+      static bool
+      lt(const char_type& __c1, const char_type& __c2)
+      { return __c1 < __c2; }
+
+      static int
+      compare(const char_type* __s1, const char_type* __s2, size_t __n)
+      {
+        for (size_t __i = 0; __i < __n; ++__i)
+          if (!eq(__s1[__i], __s2[__i]))
+            return lt(__s1[__i], __s2[__i]) ? -1 : 1;
+        return 0;
+      }
+
+      static size_t
+      length(const char_type* __s)
+      {
+        const char_type* __p = __s;
+          while (__p)
+            ++__p;
+        return (__p - __s);
+      }
+
+      static const char_type*
+      find(const char_type* __s, size_t __n, const char_type& __a)
+      {
+        for (const char_type* __p = __s; size_t(__p - __s) < __n; ++__p)
+          if (*__p == __a) return __p;
+        return 0;
+      }
+
+      static char_type*
+      move(char_type* __s1, const char_type* __s2, size_t __n)
+      { return (char_type*) memmove(__s1, __s2, __n * sizeof(char_type)); }
+
+      static char_type*
+      copy(char_type* __s1, const char_type* __s2, size_t __n)
+      { return (char_type*) memcpy(__s1, __s2, __n * sizeof(char_type)); }
+
+      static char_type*
+      assign(char_type* __s, size_t __n, char_type __a)
+      {
+        for (char_type* __p = __s; __p < __s + __n; ++__p)
+          assign(*__p, __a);
+        return __s;
+      }
+
+      static char_type
+      to_char_type(const int_type& __c)
+      { return char_type(); }
+
+      static int_type
+      to_int_type(const char_type& __c) { return int_type(); }
+
+      static bool
+      eq_int_type(const int_type& __c1, const int_type& __c2)
+      { return __c1 == __c2; }
+
+      static int_type
+      eof() { return static_cast<int_type>(-1); }
+
+      static int_type
+      not_eof(const int_type& __c)
+      { return eq_int_type(__c, eof()) ? int_type(0) : __c; }
+    };
+
+} // namespace std
+#endif // GCC version 3
+
+
 namespace zmq
 {
 
diff --git a/src/clock.cpp b/src/clock.cpp
index 4868a5f7..db5f28f9 100644
--- a/src/clock.cpp
+++ b/src/clock.cpp
@@ -70,7 +70,16 @@ uint64_t zmq::clock_t::now_us ()
     //  Use POSIX clock_gettime function to get precise monotonic time.
     struct timespec tv;
     int rc = clock_gettime (CLOCK_MONOTONIC, &tv);
-    errno_assert (rc == 0);
+		// Fix case where system has clock_gettime but CLOCK_MONOTONIC is not supported.
+		// This should be a configuration check, but I looked into it and writing an 
+		// AC_FUNC_CLOCK_MONOTONIC seems beyond my powers.
+		if( rc != 0) {
+			//  Use POSIX gettimeofday function to get precise time.
+			struct timeval tv;
+			int rc = gettimeofday (&tv, NULL);
+			errno_assert (rc == 0);
+			return (tv.tv_sec * (uint64_t) 1000000 + tv.tv_usec);
+		}
     return (tv.tv_sec * (uint64_t) 1000000 + tv.tv_nsec / 1000);
 
 #else
diff --git a/src/ctx.hpp b/src/ctx.hpp
index e09149d3..d259f594 100644
--- a/src/ctx.hpp
+++ b/src/ctx.hpp
@@ -99,9 +99,9 @@ namespace zmq
             reaper_tid = 1
         };
 
+        ~ctx_t ();
     private:
 
-        ~ctx_t ();
 
         //  Used to check whether the object is a context.
         uint32_t tag;