diff --git a/taskflow/types/latch.py b/taskflow/types/latch.py
index 9aa2622d..0945a286 100644
--- a/taskflow/types/latch.py
+++ b/taskflow/types/latch.py
@@ -20,7 +20,12 @@ from taskflow.types import timing as tt
 
 
 class Latch(object):
-    """A class that ensures N-arrivals occur before unblocking."""
+    """A class that ensures N-arrivals occur before unblocking.
+
+    TODO(harlowja): replace with http://bugs.python.org/issue8777 when we no
+    longer have to support python 2.6 or 2.7 and we can only support 3.2 or
+    later.
+    """
 
     def __init__(self, count):
         count = int(count)
diff --git a/taskflow/utils/lock_utils.py b/taskflow/utils/lock_utils.py
index dbc0b778..282756f3 100644
--- a/taskflow/utils/lock_utils.py
+++ b/taskflow/utils/lock_utils.py
@@ -142,6 +142,9 @@ class ReaderWriterLock(_ReaderWriterLockBase):
     the write lock.
 
     In the future these restrictions may be relaxed.
+
+    This can be eventually removed if http://bugs.python.org/issue8800 ever
+    gets accepted into the python standard threading library...
     """
     WRITER = 'w'
     READER = 'r'