diff --git a/pyopencl/algorithm.py b/pyopencl/algorithm.py
index 91a80dff91667c794782fe60404ee252fbeb1265..60e879038fb716e219537b06ee1ff4998428b4e4 100644
--- a/pyopencl/algorithm.py
+++ b/pyopencl/algorithm.py
@@ -686,7 +686,7 @@ class ListOfListsBuilder:
                 }
                 \"\"\", arg_decls=[])
 
-        result = builder(queue, 2000)
+        result, event = builder(queue, 2000)
 
         inf = result["mylist"]
         assert inf.count == 3000
diff --git a/pyopencl/array.py b/pyopencl/array.py
index d3ef426fb1b8410167dd8a6240a6060d4a9161b5..a5051800159c0789526dcc91f50a7e5cb1a0a115 100644
--- a/pyopencl/array.py
+++ b/pyopencl/array.py
@@ -359,7 +359,7 @@ class Array(object):
     Boolean arrays are stored as :class:`numpy.int8` because ``bool``
     has an unspecified size in the OpenCL spec.
 
-    .. automethod :: __bool__
+    .. automethod :: __nonzero__
 
         Only works for device scalars. (i.e. "arrays" with ``shape == ()``.)