diff --git a/lib/backend.py b/lib/backend.py
index 1c9cfdbaaff833f9525319db0fb1990c288f521e..b3e3f49e9cff9a2a7587aa69ee2c8fc33602bb94 100644
--- a/lib/backend.py
+++ b/lib/backend.py
@@ -575,7 +575,6 @@ def GetInstanceList(hypervisor_list):
       results.extend(names)
     except errors.HypervisorError, err:
       logging.exception("Error enumerating instances for hypevisor %s", hname)
-      # FIXME: should we somehow not propagate this to the master?
       raise
 
   return results
@@ -1666,7 +1665,6 @@ def OSEnvironment(instance, debug=0):
                                     str(disk))
     real_disk.Open()
     result['DISK_%d_PATH' % idx] = real_disk.dev_path
-    # FIXME: When disks will have read-only mode, populate this
     result['DISK_%d_ACCESS' % idx] = disk.mode
     if constants.HV_DISK_TYPE in instance.hvparams:
       result['DISK_%d_FRONTEND_TYPE' % idx] = \
diff --git a/lib/cli.py b/lib/cli.py
index 0d5a5db158929b0a0f85ac751085d80cb970f2ca..124f602ed920e8588d9c04217fb2f9b9746d0b11 100644
--- a/lib/cli.py
+++ b/lib/cli.py
@@ -797,7 +797,7 @@ def GenerateTable(headers, fields, separator, data,
   format_fields = []
   for field in fields:
     if headers and field not in headers:
-      # FIXME: handle better unknown fields (either revert to old
+      # TODO: handle better unknown fields (either revert to old
       # style of raising exception, or deal more intelligently with
       # variable fields)
       headers[field] = field