diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/property/PropertyGrid.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/property/PropertyGrid.java
index d1a1e621cf1e8a28148cbf6cc6fd142db544c48a..6e70185b237409b7c9e584abe44bc2d971727d10 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/property/PropertyGrid.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/property/PropertyGrid.java
@@ -113,7 +113,8 @@ public final class PropertyGrid extends Grid
      * <li>given <var>clazz</var> is <code>null</code></li>
      * </ul>
      */
-    @SuppressWarnings("unchecked")
+    @SuppressWarnings(
+        { "unchecked", "rawtypes" })
     private final <T> IPropertyValueRenderer<? super T> getPropertyValueRenderer(final T value)
     {
         if (value == null)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/UploadServiceServlet.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/UploadServiceServlet.java
index b116d6bbbadca8782eeb3561f60778264fc93672..c57f05e1e7683e6fa4aadf624aa5d3f3450d16fa 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/UploadServiceServlet.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/UploadServiceServlet.java
@@ -86,7 +86,8 @@ public final class UploadServiceServlet extends AbstractCommandController
         this(new SessionFilesSetter());
     }
 
-    @SuppressWarnings("unchecked")
+    @SuppressWarnings(
+        { "unchecked", "rawtypes" })
     private final static Iterator<String> cast(final Iterator iterator)
     {
         return iterator;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/AuthorizationAdvisor.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/AuthorizationAdvisor.java
index dacc68a16febdb689fa49e3ae0daea9d98ebb768..64fe8f8951e155c7e074cbba05b398da6c2a3f02 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/AuthorizationAdvisor.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/AuthorizationAdvisor.java
@@ -121,7 +121,8 @@ public final class AuthorizationAdvisor extends DefaultPointcutAdvisor
             }
         }
 
-        @SuppressWarnings("unchecked")
+        @SuppressWarnings(
+            { "unchecked", "rawtypes" })
         private final static Argument<?> toArgument(final Parameter<AuthorizationGuard> parameter,
                 final Object[] args)
         {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/AuthorizationDataProvider.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/AuthorizationDataProvider.java
index 942103abab2632f6d0684b7bd1773f18a09e1df3..e3ac6ef112f12704f6b09dfa92bab9cdd82d1a89 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/AuthorizationDataProvider.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/AuthorizationDataProvider.java
@@ -472,7 +472,8 @@ final public class AuthorizationDataProvider implements IAuthorizationDataProvid
      * methods.
      * </p>
      */
-    @SuppressWarnings("unchecked")
+    @SuppressWarnings(
+        { "unchecked", "rawtypes" })
     private static final <T> List<T> cast(final List list)
     {
         return list;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/PrimitiveValue.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/PrimitiveValue.java
index bebf48a18b4a26bb6835256b9e66255015540ce0..aafabd47fb1d7c24031d697caa4a95add3b1e605 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/PrimitiveValue.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/PrimitiveValue.java
@@ -88,7 +88,8 @@ public class PrimitiveValue implements IsSerializable, Serializable, Comparable<
     }
 
     @Override
-    @SuppressWarnings("unchecked")
+    @SuppressWarnings(
+        { "unchecked", "rawtypes" })
     public int compareTo(PrimitiveValue o)
     {
         Integer thisTypeOrdinal = getComparableDataTypeOrdinal();
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 e95a4065c6b7ad090e41afcf2456a1895077d9c7..19a8768661bce42149fb40ca823c0c4f69974929 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
@@ -58,7 +58,8 @@ public class PropertyCheckingManager extends Assert
     /**
      * Checks the assertion for the specified properties.
      */
-    @SuppressWarnings("unchecked")
+    @SuppressWarnings(
+        { "unchecked", "rawtypes" })
     public void assertProperties(final Map<String, ?> actualProperties)
     {
         for (final Map.Entry<String, IValueAssertion> expectedProperty : expectedProperties