diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/LoginPanelAutofill.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/LoginPanelAutofill.java
index cff81edcd5c7801c04fb6826a5e30120982c69dd..226aded44feb067fc584c64158cd923fa1fa7b10 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/LoginPanelAutofill.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/LoginPanelAutofill.java
@@ -42,15 +42,16 @@ import ch.systemsx.cisd.openbis.generic.client.web.client.dto.SessionContext;
  * This class uses a variant of a trick described in the GWT discussion forum to support autofill.
  * Browsers do not support autofill on input fields that are generated on the client by javascript,
  * so it is necessary for the page to statically contain the input fields we want to autofill. These
- * fields are unhidden and used on the login page. TODO This implementation currently supports
- * Firefox, but not Safari or Chrome. To support Safari, we cannot use javascript in the action,
- * instead we need to have the login post data to a server.
+ * fields are unhidden and used on the login page.
  * 
  * @see <a href
  *      ="http://groups.google.com/group/Google-Web-Toolkit/browse%5Fthread/thread/2b2ce0b6aaa82461">GWT
  *      Discussion Forum</a>
  * @author Chandrasekhar Ramakrishnan
  */
+// TODO 2010-03-10, CR: This implementation currently supports Firefox, but not Safari or Chrome. To
+// support Safari, we cannot use javascript in the action, instead we need to have the login post
+// data to a server.
 public class LoginPanelAutofill extends VerticalPanel
 {
     private final IViewContext<ICommonClientServiceAsync> viewContext;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/ComparableCellValueHelper.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/ComparableCellValueHelper.java
index 38d6e1bde9ab87c71fe7a459773c242065f23061..5aa4ac8b32802cf0099e6014faae4708975a7f3a 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/ComparableCellValueHelper.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/ComparableCellValueHelper.java
@@ -27,8 +27,8 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.IntegerTableCell;
 public class ComparableCellValueHelper
 {
 
-    // TODO CR --This code should be a method on ISerializableComparable and implemented using
-    // polymorphism.
+    // TODO 2010-03-10, CR: This code should be a method on ISerializableComparable and implemented
+    // using polymorphism.
     public static Comparable<?> unwrap(ISerializableComparable cellValue)
     {
         if (cellValue instanceof DateTableCell)