diff --git a/TODO b/TODO
index 0999bffb04bf5ae6cab44b946aa5afba47cf78e6..c9974efe3618684043927fa454e49c994b93d3ca 100644
--- a/TODO
+++ b/TODO
@@ -14,9 +14,7 @@ Version 1.5.0:
     - Fix link detection in generic driver.
     - Add native drivers from 2.6.24 up to 2.6.31.
 * ethercat tool:
-    - Output error after usage.
     - Implement ranges for slaves and domains.
-* Fix casting away constness during expected WC calculation.
 
 Future issues:
 
@@ -72,9 +70,12 @@ Future issues:
     - Implement indent in 'ethercat ma'
     - Implement 0xXXXX:YY format for specifying SDOs.
     - Implement reading from stream for soe_write.
+    - Output error after usage.
 * Simplify master fsm by introducing a common request state to handle external
   requests (replace write_sii, sdo_request, etc).
 * Remove stdio uses in userspace library?
+* Fix casting away constness during expected WC calculation.
+* Fix bus scan hang when calling ecrt_master_deactivate().
 
 Smaller issues: