diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/DistributionSetManagementTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/DistributionSetManagementTest.java
index 14f1838b0..223196e93 100644
--- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/DistributionSetManagementTest.java
+++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/DistributionSetManagementTest.java
@@ -820,8 +820,8 @@ public class DistributionSetManagementTest extends AbstractJpaIntegrationTest {
     }
 
     @Test
-    @Description("Test different assignment results, after assign a ds")
-    public void testAlreadyAssignedTargetsToDs() {
+    @Description("Verfiy that the DistributionSetAssignmentResult not contains already assigned targets.")
+    public void verifyDistributionSetAssignmentResultNotContainsAlreadyAssignedTargets() {
         DistributionSet dsToTargetAssigned = testdataFactory.createDistributionSet("ds-3");
 
         // create assigned DS
@@ -829,8 +829,7 @@ public class DistributionSetManagementTest extends AbstractJpaIntegrationTest {
                 dsToTargetAssigned.getVersion());
         final Target target = new JpaTarget("4712");
         final Target savedTarget = targetManagement.createTarget(target);
-        final List<Target> toAssign = new ArrayList<>();
-        toAssign.add(savedTarget);
+        final List<Target> toAssign = Lists.newArrayList(savedTarget);
         DistributionSetAssignmentResult assignmentResult = deploymentManagement
                 .assignDistributionSet(dsToTargetAssigned, toAssign);
         assertThat(assignmentResult.getAssignedEntity()).hasSize(1);
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetTable.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetTable.java
index 87ce33e39..3864ad3a6 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetTable.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetTable.java
@@ -518,7 +518,6 @@ public class TargetTable extends AbstractTable<Target, TargetIdName> {
      * Set style of target table.
      *
      */
-    @SuppressWarnings("serial")
     private void styleTargetTable() {
         setCellStyleGenerator((source, itemId, propertyId) -> null);
     }
@@ -559,7 +558,7 @@ public class TargetTable extends AbstractTable<Target, TargetIdName> {
         final String targTagName = HawkbitCommonUtil.removePrefix(event.getTransferable().getSourceComponent().getId(),
                 SPUIDefinitions.TARGET_TAG_ID_PREFIXS);
         if (targetList.isEmpty()) {
-            final String actionDidNotWork = i18n.get("message.action.did.not.work", new Object[] {});
+            final String actionDidNotWork = i18n.get("message.action.did.not.work");
             notification.displayValidationError(actionDidNotWork);
             return;
         }
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/I18N.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/I18N.java
index cef37085b..ce57a49a5 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/I18N.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/I18N.java
@@ -66,6 +66,25 @@ public class I18N implements Serializable {
      * @see #getLocale()
      */
     public String get(final String code, final Object... args) {
+        return getMessage(code, args);
+    }
+
+    /**
+     * Tries to resolve the message.
+     *
+     * @param code
+     *            the code to lookup up.
+     *
+     * @return the resolved message, or the message code if the lookup fails.
+     *
+     * @see MessageSource#getMessage(String, Object[], Locale)
+     * @see #getLocale()
+     */
+    public String get(final String code) {
+        return getMessage(code, null);
+    }
+
+    private String getMessage(final String code, final Object[] args) {
         try {
             return source.getMessage(code, args, getLocale());
         } catch (final NoSuchMessageException ex) {