diff --git a/common/source/java/ch/systemsx/cisd/common/annotation/CollectionMapping.java b/common/source/java/ch/systemsx/cisd/common/annotation/CollectionMapping.java
index ca37b13986dfc8cad0eb5ce8d0cef8fbc376eaef..4773bab899e1b210830669ab1f69707cae31aec6 100644
--- a/common/source/java/ch/systemsx/cisd/common/annotation/CollectionMapping.java
+++ b/common/source/java/ch/systemsx/cisd/common/annotation/CollectionMapping.java
@@ -37,7 +37,7 @@ public @interface CollectionMapping
     /**
      * The concrete class to use as a collection.
      */
-    @SuppressWarnings("unchecked")
+    @SuppressWarnings({ "rawtypes" })
     // No way to avoid the warning since the compiler doesn't accept something like
     // ArrayList<String>.class
     Class<? extends Collection> collectionClass();
diff --git a/common/source/java/ch/systemsx/cisd/common/exceptions/StatusWithResult.java b/common/source/java/ch/systemsx/cisd/common/exceptions/StatusWithResult.java
index 2f66bec5346370740b97745428e4ed1159be9bad..d3bc2edbb3ea81bc05b1f49cde1da2bb093f2d6b 100644
--- a/common/source/java/ch/systemsx/cisd/common/exceptions/StatusWithResult.java
+++ b/common/source/java/ch/systemsx/cisd/common/exceptions/StatusWithResult.java
@@ -100,7 +100,7 @@ public class StatusWithResult<T> extends Status
     @SuppressWarnings("unchecked")
     private StatusWithResult<T> toStatusWithResult(Object obj)
     {
-        return (StatusWithResult) obj;
+        return (StatusWithResult<T>) obj;
     }
 
     @Override
diff --git a/common/source/java/ch/systemsx/cisd/common/utilities/BeanUtils.java b/common/source/java/ch/systemsx/cisd/common/utilities/BeanUtils.java
index 864c70a0513ed637447c346e6d62a812f66eedcd..9e246853cd47ca612c08672b1545890fa374de9e 100644
--- a/common/source/java/ch/systemsx/cisd/common/utilities/BeanUtils.java
+++ b/common/source/java/ch/systemsx/cisd/common/utilities/BeanUtils.java
@@ -159,7 +159,7 @@ public final class BeanUtils
         {
         };
 
-    @SuppressWarnings("unchecked")
+    @SuppressWarnings({ "unchecked", "rawtypes" })
     static final Set<Class> immutableTypes = new LinkedHashSet<Class>(Arrays.asList(boolean.class,
             Boolean.class, byte.class, Byte.class, short.class, Short.class, int.class,
             Integer.class, long.class, Long.class, float.class, Float.class, double.class,
@@ -520,9 +520,10 @@ public final class BeanUtils
         return (E[]) Array.newInstance(elemClass, length);
     }
 
-    @SuppressWarnings("unchecked")
+    
     // No way to avoid the warning since the compiler doesn't accept something like
     // ArrayList<String>.class
+    @SuppressWarnings("rawtypes")
     private final static <T> T createCollection(final int size,
             final AnnotationMap setterAnnotations) throws InstantiationException,
             IllegalAccessException, SecurityException, NoSuchMethodException,
@@ -541,7 +542,7 @@ public final class BeanUtils
         }
     }
 
-    @SuppressWarnings("unchecked")
+    @SuppressWarnings({ "unchecked", "rawtypes" })
     private static <T> T constructCollection(
             final Constructor<? extends Collection> constructorWithSize, final int size)
             throws InstantiationException, IllegalAccessException, IllegalArgumentException,
@@ -555,7 +556,7 @@ public final class BeanUtils
             { size });
     }
 
-    @SuppressWarnings("unchecked")
+    @SuppressWarnings({ "unchecked", "rawtypes" })
     private final static <T> T constructCollection(final Class<? extends Collection> collectionClazz)
             throws InstantiationException, IllegalAccessException
     {
@@ -705,7 +706,7 @@ public final class BeanUtils
         }
     }
 
-    @SuppressWarnings("unchecked")
+    @SuppressWarnings({ "unchecked", "rawtypes" })
     private static void addToUntypedCollection(final Collection destination, final Object element)
     {
         destination.add(element);
diff --git a/common/sourceTest/java/ch/systemsx/cisd/common/process/ProcessExecutionHelperTest.java b/common/sourceTest/java/ch/systemsx/cisd/common/process/ProcessExecutionHelperTest.java
index 98d92af22594b126888a20fac23537dd79c56c10..53de9083e7f03828c6008e8bcc6bf2c70c5c0409 100644
--- a/common/sourceTest/java/ch/systemsx/cisd/common/process/ProcessExecutionHelperTest.java
+++ b/common/sourceTest/java/ch/systemsx/cisd/common/process/ProcessExecutionHelperTest.java
@@ -503,6 +503,7 @@ public class ProcessExecutionHelperTest
                 result.getStartupFailureMessage().indexOf("some_non_existent_executable") >= 0);
     }
 
+    @SuppressWarnings("null")
     @Test(groups =
         { "requires_unix", "slow" })
     public void testSleepyExecutionWithTermination() throws Exception
@@ -527,7 +528,6 @@ public class ProcessExecutionHelperTest
         // Now resultGetter should be done with obtaining the result.
         ProcessResult processResult = result.get();
         assertTrue(processResult != null);
-        assert processResult != null; // avoid compiler warnings
         assertFalse(processResult.isOK()); // process terminated unsuccessfully
         assertTrue(processResult.isInterruped() || processResult.isTerminated());
     }