diff --git a/reclass/__init__.py b/reclass/__init__.py
index d5f3410..6aabf3d 100644
--- a/reclass/__init__.py
+++ b/reclass/__init__.py
@@ -15,7 +15,7 @@
 from .storage.loader import StorageBackendLoader
 from .storage.memcache_proxy import MemcacheProxy
 
-def get_storage(storage_type, nodes_uri, classes_uri, compose_node_name, **kwargs):
+def get_storage(storage_type, nodes_uri, classes_uri, compose_node_name=False, **kwargs):
     storage_class = StorageBackendLoader(storage_type).load()
     return MemcacheProxy(storage_class(nodes_uri, classes_uri, compose_node_name, **kwargs))
 
diff --git a/reclass/values/parser_funcs.py b/reclass/values/parser_funcs.py
index db34ceb..21952ca 100644
--- a/reclass/values/parser_funcs.py
+++ b/reclass/values/parser_funcs.py
@@ -14,6 +14,11 @@
 import pyparsing as pp
 import six
 
+try:
+    collectionsAbc = collections.abc
+except AttributeError:
+    collectionsAbc = collections
+
 tags = enum.Enum('Tags', ['STR', 'REF', 'INV'])
 
 _OBJ = 'OBJ'
@@ -49,7 +54,7 @@
     return x
 
 def listify(w, modifier=_asList):
-    if (isinstance(w, collections.Iterable) and
+    if (isinstance(w, collectionsAbc.Iterable) and
             not isinstance(w, six.string_types)):
         cls = type(w)
         if cls == pp.ParseResults: