diff --git a/aioriak/datatypes/map.py b/aioriak/datatypes/map.py
index a2169bf..d572ff3 100644
--- a/aioriak/datatypes/map.py
+++ b/aioriak/datatypes/map.py
@@ -1,6 +1,6 @@
 from .datatype import Datatype
 from . import TYPES
-from collections import Mapping
+from collections.abc import Mapping
 from riak.util import lazy_property
 
 
diff --git a/aioriak/datatypes/register.py b/aioriak/datatypes/register.py
index ed0beec..6f7ef6f 100644
--- a/aioriak/datatypes/register.py
+++ b/aioriak/datatypes/register.py
@@ -1,4 +1,4 @@
-from collections import Sized
+from collections.abc import Sized
 from aioriak.datatypes.datatype import Datatype
 from aioriak.datatypes import TYPES
 
diff --git a/aioriak/datatypes/set.py b/aioriak/datatypes/set.py
index 44fce46..e399063 100644
--- a/aioriak/datatypes/set.py
+++ b/aioriak/datatypes/set.py
@@ -3,7 +3,7 @@
 from aioriak.datatypes import TYPES
 
 
-class Set(collections.Set, Datatype):
+class Set(collections.abc.Set, Datatype):
     '''A convergent datatype representing a Set with observed-remove
     semantics. Currently strings are the only supported value type.
 
@@ -93,7 +93,7 @@ def _coerce_value(self, new_value):
         return frozenset(new_value)
 
     def _check_type(self, new_value):
-        if not isinstance(new_value, collections.Iterable):
+        if not isinstance(new_value, collections.abc.Iterable):
             return False
         for element in new_value:
             if not isinstance(element, str):
diff --git a/aioriak/transport.py b/aioriak/transport.py
index 0ef8e98..6c92b7e 100644
--- a/aioriak/transport.py
+++ b/aioriak/transport.py
@@ -47,7 +47,7 @@ def _encode_link_field(value):
 
 async def create_transport(host='localhost', port=8087, loop=None):
     reader, writer = await asyncio.open_connection(
-        host, port, loop=loop)
+        host, port)
     conn = RiakPbcAsyncTransport(reader, writer, loop=loop)
     return conn
 
diff --git a/requirements.txt b/requirements.txt
index 9b11e30..0855d5f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1 +1 @@
-riak==2.7.0
+riak @ git+https://github.com/StreetHawkInc/riak-python-client.git@master