diff --git a/account-ui/src/main/java/de/muehlencord/shared/account/web/presentation/UniqueApplicationRoleNameValidator.java b/account-ui/src/main/java/de/muehlencord/shared/account/web/presentation/UniqueApplicationRoleNameValidator.java
index 095c7be..e3c046f 100644
--- a/account-ui/src/main/java/de/muehlencord/shared/account/web/presentation/UniqueApplicationRoleNameValidator.java
+++ b/account-ui/src/main/java/de/muehlencord/shared/account/web/presentation/UniqueApplicationRoleNameValidator.java
@@ -1,11 +1,7 @@
 package de.muehlencord.shared.account.web.presentation;
 
-import de.muehlencord.shared.account.business.application.entity.ApplicationRoleEntity;
-import de.muehlencord.shared.account.business.application.control.ApplicationRoleControl;
-import de.muehlencord.shared.account.business.application.entity.ApplicationEntity;
-import de.muehlencord.shared.account.util.AccountPU;
 import java.io.Serializable;
-import java.util.UUID;
+
 import javax.faces.application.FacesMessage;
 import javax.faces.component.UIComponent;
 import javax.faces.component.UIInput;
@@ -16,6 +12,11 @@ import javax.faces.validator.ValidatorException;
 import javax.inject.Inject;
 import javax.persistence.EntityManager;
 
+import de.muehlencord.shared.account.business.application.control.ApplicationRoleControl;
+import de.muehlencord.shared.account.business.application.entity.ApplicationEntity;
+import de.muehlencord.shared.account.business.application.entity.ApplicationRoleEntity;
+import de.muehlencord.shared.account.util.AccountPU;
+
 /**
  *
  * @author Joern Muehlencord <joern at muehlencord.de>
diff --git a/account-ui/src/main/java/de/muehlencord/shared/account/web/presentation/UniqueApplicationValidator.java b/account-ui/src/main/java/de/muehlencord/shared/account/web/presentation/UniqueApplicationValidator.java
index 8d2d44c..67b53b0 100644
--- a/account-ui/src/main/java/de/muehlencord/shared/account/web/presentation/UniqueApplicationValidator.java
+++ b/account-ui/src/main/java/de/muehlencord/shared/account/web/presentation/UniqueApplicationValidator.java
@@ -1,9 +1,7 @@
 package de.muehlencord.shared.account.web.presentation;
 
-import de.muehlencord.shared.account.business.application.control.ApplicationControl;
-import de.muehlencord.shared.account.business.application.entity.ApplicationEntity;
 import java.io.Serializable;
-import java.util.UUID;
+
 import javax.faces.application.FacesMessage;
 import javax.faces.component.UIComponent;
 import javax.faces.component.UIInput;
@@ -12,9 +10,13 @@ import javax.faces.validator.FacesValidator;
 import javax.faces.validator.Validator;
 import javax.faces.validator.ValidatorException;
 import javax.inject.Inject;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import de.muehlencord.shared.account.business.application.control.ApplicationControl;
+import de.muehlencord.shared.account.business.application.entity.ApplicationEntity;
+
 /**
  *
  * @author Joern Muehlencord <joern at muehlencord.de>
diff --git a/account/src/main/java/de/muehlencord/shared/account/business/AbstractController.java b/account/src/main/java/de/muehlencord/shared/account/business/AbstractController.java
index d7576f7..0554bbe 100644
--- a/account/src/main/java/de/muehlencord/shared/account/business/AbstractController.java
+++ b/account/src/main/java/de/muehlencord/shared/account/business/AbstractController.java
@@ -54,7 +54,7 @@ public abstract class AbstractController<T> {
 
     private final Class<T> entityClass;
 
-    public AbstractController(Class clazz) {
+    public AbstractController(Class<T> clazz) {
         this.entityClass = clazz;
     }
 
diff --git a/account/src/main/java/de/muehlencord/shared/account/shiro/filter/JWTAuthenticationFilter.java b/account/src/main/java/de/muehlencord/shared/account/shiro/filter/JWTAuthenticationFilter.java
index 46af758..845363c 100644
--- a/account/src/main/java/de/muehlencord/shared/account/shiro/filter/JWTAuthenticationFilter.java
+++ b/account/src/main/java/de/muehlencord/shared/account/shiro/filter/JWTAuthenticationFilter.java
@@ -15,15 +15,9 @@
  */
 package de.muehlencord.shared.account.shiro.filter;
 
-import de.muehlencord.shared.account.business.account.boundary.ApiKeyError;
-import de.muehlencord.shared.account.business.account.boundary.ApiKeyService;
-import de.muehlencord.shared.account.business.account.entity.JWTObject;
-import de.muehlencord.shared.account.shiro.token.JWTAuthenticationToken;
-import de.muehlencord.shared.account.util.AccountSecurityException;
-import de.muehlencord.shared.jeeutil.restexfw.APIException;
 import java.io.IOException;
 import java.io.StringReader;
-import java.util.Locale;
+
 import javax.json.Json;
 import javax.json.JsonObject;
 import javax.json.JsonReader;
@@ -35,6 +29,7 @@ import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
 import org.apache.commons.io.IOUtils;
 import org.apache.shiro.authc.AuthenticationToken;
 import org.apache.shiro.authc.UsernamePasswordToken;
@@ -42,6 +37,12 @@ import org.apache.shiro.web.filter.authc.AuthenticatingFilter;
 import org.apache.shiro.web.util.WebUtils;
 import org.slf4j.LoggerFactory;
 
+import de.muehlencord.shared.account.business.account.boundary.ApiKeyService;
+import de.muehlencord.shared.account.business.account.entity.JWTObject;
+import de.muehlencord.shared.account.shiro.token.JWTAuthenticationToken;
+import de.muehlencord.shared.account.util.AccountSecurityException;
+import de.muehlencord.shared.jeeutil.restexfw.APIException;
+
 /**
  *
  * @author Joern Muehlencord <joern at muehlencord.de>
diff --git a/account/src/test/resources/log4j.xml b/account/src/test/resources/log4j.xml
index 9386761..944fa4a 100644
--- a/account/src/test/resources/log4j.xml
+++ b/account/src/test/resources/log4j.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>  
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">  
+<!DOCTYPE log4j:configuration PUBLIC "-//APACHE//DTD LOG4J 1.2//EN" "http://logging.apache.org/log4j/1.2/apidocs/org/apache/log4j/xml/doc-files/log4j.dtd">
 <log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/"  
                      debug="true">  
         
diff --git a/jeeutil/src/main/java/de/muehlencord/shared/jeeutil/validator/EmailClientValidationConstraint.java b/jeeutil/src/main/java/de/muehlencord/shared/jeeutil/validator/EmailClientValidationConstraint.java
index 64a1127..883c1cb 100644
--- a/jeeutil/src/main/java/de/muehlencord/shared/jeeutil/validator/EmailClientValidationConstraint.java
+++ b/jeeutil/src/main/java/de/muehlencord/shared/jeeutil/validator/EmailClientValidationConstraint.java
@@ -31,7 +31,7 @@ public class EmailClientValidationConstraint implements ClientValidationConstrai
     @Override
     public Map<String, Object> getMetadata(ConstraintDescriptor constraintDescriptor) {
         Map<String, Object> metadata = new HashMap<>();
-        Map attrs = constraintDescriptor.getAttributes();
+        Map<?, ?> attrs = constraintDescriptor.getAttributes();
         Object message = attrs.get("message");
         if (message != null) {
             metadata.put(MESSAGE_METADATA, message);