diff --git a/src/plivo/core/freeswitch/eventsocket.py b/src/plivo/core/freeswitch/eventsocket.py
index 52a9e09e..7018e5f1 100644
--- a/src/plivo/core/freeswitch/eventsocket.py
+++ b/src/plivo/core/freeswitch/eventsocket.py
@@ -10,7 +10,10 @@
 import gevent
 import gevent.event
 import gevent.socket as socket
-from gevent.coros import RLock
+try:
+    from gevent.lock import RLock
+except:
+    from gevent.coros import RLock
 import gevent.pool
 from gevent import GreenletExit
 
diff --git a/src/plivo/core/freeswitch/outboundsocket.py b/src/plivo/core/freeswitch/outboundsocket.py
index ef6faefc..aabaca8f 100644
--- a/src/plivo/core/freeswitch/outboundsocket.py
+++ b/src/plivo/core/freeswitch/outboundsocket.py
@@ -111,10 +111,10 @@ def __init__(self, address, handle_class, filter="ALL"):
         self._filter = filter
         #Define the Class that will handle process when receiving message
         self._requestClass = handle_class
-        StreamServer.__init__(self, address, self.do_handle, 
+        StreamServer.__init__(self, address, self.handler, 
                         backlog=BACKLOG, spawn=gevent.spawn_raw)
 
-    def do_handle(self, socket, address):
+    def handler(self, socket, address):
         try:
             self.handle_request(socket, address)
         finally: