diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/GWTUtils.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/GWTUtils.java
index e2ee6f849fe6de6b6efae26ce5e3c7f8a7d39832..9bc5cafa869aa3e64c157aad5398e1f3d95792c4 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/GWTUtils.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/GWTUtils.java
@@ -96,7 +96,7 @@ public final class GWTUtils
      * Sets up {@link ComboBox} to have width of list auto adjusted to maximum width of elements in
      * the list.
      */
-    // FIXME 2010-05-19, Piotr Buczek: the width is not updated when store is changed;
+    // TODO 2010-05-19, Piotr Buczek: the width is not updated when store is changed;
     public static void setupAutoWidth(final ComboBox<?> comboBox)
     {
         // can't get el() of listView before it is rendered
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/HibernateSearchDAOTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/HibernateSearchDAOTest.java
index 556b964b8296fbb7d6a19670788117950dddb57a..8d8f6bbc36b2ccbf073443406ae30251ae232770 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/HibernateSearchDAOTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/HibernateSearchDAOTest.java
@@ -482,7 +482,7 @@ public final class HibernateSearchDAOTest extends AbstractDAOTest
     // restoreSearchIndex();
     // }
 
-    // FIXME 2010-10-22, Piotr Buczek: write a different test (auto update is switched off)
+    // TODO 2010-10-22, Piotr Buczek: write a different test (auto update is switched off)
     @Test(groups = "broken")
     /*
      * Checks if the dataset search index is properly updated after properties of a dataset have