diff --git a/epoll_server/simple_epoll_server_test.cc b/epoll_server/simple_epoll_server_test.cc
index 7c024f1..f5511d0 100644
--- a/epoll_server/simple_epoll_server_test.cc
+++ b/epoll_server/simple_epoll_server_test.cc
@@ -258,7 +258,7 @@
 
     int pipe_fds[2];
     if (pipe(pipe_fds) < 0) {
-      PLOG(FATAL) << "pipe() failed";
+      EPOLL_PLOG(FATAL) << "pipe() failed";
     }
     fd_ = pipe_fds[0];
     fd2_ = pipe_fds[1];
@@ -1724,7 +1724,7 @@
 void TestPipe(char *test_message, int len) {
   int pipe_fds[2];
   if (pipe(pipe_fds) < 0) {
-    PLOG(FATAL) << "pipe failed()";
+    EPOLL_PLOG(FATAL) << "pipe failed()";
   }
   int reader_pipe = pipe_fds[0];
   int writer_pipe = pipe_fds[1];
@@ -1744,14 +1744,14 @@
         }
       }
       if (len > 0) {
-        PLOG(FATAL) << "write() failed";
+        EPOLL_PLOG(FATAL) << "write() failed";
       }
       close(writer_pipe);
 
       _exit(0);
     }
     case -1:
-      PLOG(FATAL) << "fork() failed";
+      EPOLL_PLOG(FATAL) << "fork() failed";
       break;
     default: {  // Parent will receive message.
       close(writer_pipe);
@@ -1925,7 +1925,7 @@
     // Since we can only get on the ready list once, wait till we confirm both
     // read and write side continuation state and set the correct event mask
     // for the ready list.
-    event->out_ready_mask = can_read_ ? EPOLLIN : 0;
+    event->out_ready_mask = can_read_ ? static_cast<int>(EPOLLIN) : 0;
     if (can_write_) {
       event->out_ready_mask |= EPOLLOUT;
     }