diff --git a/io/epoll.cpp b/io/epoll.cpp
index 8a3a3142..ec8a3fa7 100644
--- a/io/epoll.cpp
+++ b/io/epoll.cpp
@@ -322,7 +322,7 @@ ok:     entry.interests |= eint;
             }
             return ret;
         }
-        ret = thread_usleep(timeout.timeout() ? timeout : Timeout(10));
+        ret = thread_usleep(timeout);
         ERRNO err;
         if (ret == -1 && err.no == EOK) {
             return 0;  // Event arrived
diff --git a/io/kqueue.cpp b/io/kqueue.cpp
index c80d659e..436fe7a5 100644
--- a/io/kqueue.cpp
+++ b/io/kqueue.cpp
@@ -122,11 +122,16 @@ class KQueue : public MasterEventEngine, public CascadingEventEngine, public Res
     }
 
     int wait_for_fd(int fd, uint32_t interests, Timeout timeout) override {
+        if (unlikely(interests == 0)) {
+            errno = ENOSYS;
+            return -1;
+        }
         short ev = (interests == EVENT_READ) ? EVFILT_READ : EVFILT_WRITE;
         auto current = CURRENT;
-        enqueue(fd, ev, EV_ADD | EV_ONESHOT, 0, current, true);
+        int ret = enqueue(fd, ev, EV_ADD | EV_ONESHOT, 0, current);
+        if (ret < 0) return ret;
         if (timeout.expired()) {
-            int ret = -1;
+            ret = -1;
             do_wait_and_fire_events(0, [current, &ret](thread* th) {
                 if (th == current)
                     ret = 0;
@@ -139,7 +144,7 @@ class KQueue : public MasterEventEngine, public CascadingEventEngine, public Res
             }
             return ret;
         }
-        int ret = thread_usleep(timeout);
+        ret = thread_usleep(timeout);
         ERRNO err;
         if (ret == -1 && err.no == EOK) {
             return 0;  // event arrived