diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/CommonClientService.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/CommonClientService.java
index 3986b05781f7e8d11c4c99bd58b2bc211c049eb7..d45d0afbfb80d7c53c6ad8f7a53a15d74e576b48 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/CommonClientService.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/CommonClientService.java
@@ -73,7 +73,7 @@ import ch.systemsx.cisd.openbis.plugin.AbstractClientService;
 public final class CommonClientService extends AbstractClientService implements
         ICommonClientService
 {
-    private ICommonServer commonServer;
+    private final ICommonServer commonServer;
 
     public CommonClientService(final ICommonServer commonServer,
             final IRequestContextProvider requestContextProvider)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/GroupDAO.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/GroupDAO.java
index 847d38a51401e263bcb44a5787250d096c22c1dc..399ba4cc5e6c931c09bbc75ae1bf59db548061fc 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/GroupDAO.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/GroupDAO.java
@@ -122,7 +122,7 @@ final class GroupDAO extends AbstractDAO implements IGroupDAO
     public final void createGroup(final GroupPE group) throws DataAccessException
     {
         assert group != null : "Unspecified group";
-        // TODO 2008-12-28, Christian Ribeaud: This is a business rule. Find a better location for
+        // TODO 2008-11-28, Christian Ribeaud: This is a business rule. Find a better location for
         // this.
         assert group.getDatabaseInstance().isOriginalSource() : "Registration on a non-home database is not allowed";
         validatePE(group);