diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/HibernateSearchDAO.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/HibernateSearchDAO.java
index 3a534db3af1ec39859d54d21e27da6475a7de5a0..9e57a893bdc76f95ac4fb6a75c9460c4f482ccc0 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/HibernateSearchDAO.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/HibernateSearchDAO.java
@@ -294,6 +294,7 @@ final class HibernateSearchDAO extends HibernateDaoSupport implements IHibernate
             this.dataProvider = dataProvider;
         }
 
+        @SuppressWarnings("rawtypes")
         public List transformList(List collection)
         {
             throw new IllegalStateException("This method should not be called");
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/testframework/PropertyCheckingManager.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/testframework/PropertyCheckingManager.java
index 8487b01c40d849e7925316b31cefd4e4a7c0bb32..768ed50277f4cf95f866a3ec835968623c6393c1 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/testframework/PropertyCheckingManager.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/testframework/PropertyCheckingManager.java
@@ -32,6 +32,7 @@ import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.propert
  */
 public class PropertyCheckingManager extends Assert
 {
+    @SuppressWarnings("rawtypes")
     private final Map<String, IValueAssertion> expectedProperties =
             new HashMap<String, IValueAssertion>();
 
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/HeatmapDataset.java b/screening/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/HeatmapDataset.java
index 267436cb319605eda88d5e1c3f74f70dad1053dc..a504e534ec17ec45400a53fb2267a42b5721e9e4 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/HeatmapDataset.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/HeatmapDataset.java
@@ -100,12 +100,12 @@ public class HeatmapDataset implements XYZDataset
     }
 
     // The JFreeChart interface does not use generics
-    public Comparable getSeriesKey(int series)
+    public Comparable<?> getSeriesKey(int series)
     {
         return wrappedDataset.getSeriesKey(series);
     }
 
-    public int indexOf(Comparable seriesKey)
+    public int indexOf(@SuppressWarnings("rawtypes") Comparable seriesKey)
     {
         return wrappedDataset.indexOf(seriesKey);
     }