diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/AbstractOmniscientTopLevelDataSetRegistrator.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/AbstractOmniscientTopLevelDataSetRegistrator.java
index 38657ef00122d66aee0b092764dec09b00ed4b0f..9269f6550c09e7b89c654cd9f0777b216688359f 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/AbstractOmniscientTopLevelDataSetRegistrator.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/AbstractOmniscientTopLevelDataSetRegistrator.java
@@ -477,7 +477,7 @@ public abstract class AbstractOmniscientTopLevelDataSetRegistrator<T extends Dat
             final IDelegatedActionWithResult<Boolean> cleanAfterwardsAction,
             ITopLevelDataSetRegistratorDelegate delegate)
     {
-        @SuppressWarnings("unchecked")
+        @SuppressWarnings({ "unchecked", "rawtypes" })
         DataSetRegistrationService<T> service =
                 new DataSetRegistrationService(this, incomingDataSetFile,
                         new DefaultDataSetRegistrationDetailsFactory(getRegistratorState(),
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/AbstractDssServiceRpc.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/AbstractDssServiceRpc.java
index 18f569164472ca26ee1f38b4e21a647e11302adb..1a4cb18cba586b45c5ff25938af34e7856cf490b 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/AbstractDssServiceRpc.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/AbstractDssServiceRpc.java
@@ -44,6 +44,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ExternalData;
  */
 public abstract class AbstractDssServiceRpc<T> extends AbstractServiceWithLogger<T>
 {
+    @SuppressWarnings("hiding")
     static protected final Logger operationLog = LogFactory.getLogger(LogCategory.OPERATION,
             AbstractDssServiceRpc.class);
 
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/demo/DemoOverviewPlugin.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/demo/DemoOverviewPlugin.java
index 5cff1754ee48c283a09737cf1ecadae46c9f7c34..518711d6a13e941063d3cdcf4192f0000080a418 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/demo/DemoOverviewPlugin.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/demo/DemoOverviewPlugin.java
@@ -40,8 +40,6 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ImageResolutionKind;
  */
 public class DemoOverviewPlugin implements IDatasetImageOverviewPlugin
 {
-    private static final long serialVersionUID = 1L;
-
     private static final String LABEL_PROPERTY_KEY = "label";
 
     private static final String SMALL_IMAGE_FILE = "resource/overview-small.png";
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/PluginScriptRunnerFactory.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/PluginScriptRunnerFactory.java
index 36abacd746ed50d71b31e60a89c41398a182be42..c180735bd04ddf64473dd30046a2f98f55077a0e 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/PluginScriptRunnerFactory.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/PluginScriptRunnerFactory.java
@@ -170,8 +170,6 @@ public class PluginScriptRunnerFactory implements IPluginScriptRunnerFactory
 
         private final Evaluator evaluator;
 
-        private static final long serialVersionUID = 1L;
-
         ReportingPluginScriptRunner(Evaluator evaluator)
         {
             this.evaluator = evaluator;
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/RollbackStackTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/RollbackStackTest.java
index 003d4370632a58be7010054d4f9c03be20e973fe..87237007f2f8153b433497efa5277650ce4a58d6 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/RollbackStackTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/RollbackStackTest.java
@@ -241,6 +241,7 @@ public class RollbackStackTest extends AbstractTestWithRollbackStack
 
         private boolean rolledbackBeforePredecessor = false;
 
+        @SuppressWarnings("unused")
         private int rollbackCount = 0;
 
         protected TrackingCommand()
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/client/api/v1/impl/DssComponentTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/client/api/v1/impl/DssComponentTest.java
index c7095dc201229b7de7d4164f8700d2c47789e8bd..9afc066d263cc6181902a946f3d6dbfbb7e5ffa0 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/client/api/v1/impl/DssComponentTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/client/api/v1/impl/DssComponentTest.java
@@ -121,6 +121,7 @@ public class DssComponentTest extends AbstractFileSystemTestCase
                 //
                 // AbstractAutoProxyCreator
                 //
+                @SuppressWarnings({"rawtypes"})
                 @Override
                 protected final Object[] getAdvicesAndAdvisorsForBean(final Class beanClass,
                         final String beanName, final TargetSource customTargetSource)