diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/preferences/NotificationPreferences.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/preferences/NotificationPreferences.java
index f4939589b1a..d70311a18bb 100644
--- a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/preferences/NotificationPreferences.java
+++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/preferences/NotificationPreferences.java
@@ -6,9 +6,9 @@ import com.sap.sse.common.settings.generic.AbstractGenericSerializableSettings;
  * Preferences for Sailing users that define for which Objects a user wants to receive specific notifications.
  * This currently includes:
  * <ul>
- *   <li>Results for a favourite Competitor</li>
- *   <li>Results for a favourite BoatClass</li>
- *   <li>Upcoming races for a favourite BoatClass</li>
+ *   <li>Results for a favorite Competitor</li>
+ *   <li>Results for a favorite BoatClass</li>
+ *   <li>Upcoming races for a favorite BoatClass</li>
  * </ul>
  */
 public class NotificationPreferences extends AbstractGenericSerializableSettings {
diff --git a/java/com.sap.sse.security.userstore.mongodb/src/com/sap/sse/security/userstore/mongodb/UserStoreImpl.java b/java/com.sap.sse.security.userstore.mongodb/src/com/sap/sse/security/userstore/mongodb/UserStoreImpl.java
index 11062a4304d..7d5dae1602b 100644
--- a/java/com.sap.sse.security.userstore.mongodb/src/com/sap/sse/security/userstore/mongodb/UserStoreImpl.java
+++ b/java/com.sap.sse.security.userstore.mongodb/src/com/sap/sse/security/userstore/mongodb/UserStoreImpl.java
@@ -68,7 +68,7 @@ public class UserStoreImpl implements UserStore {
      */
     private final ConcurrentHashMap<String, Map<String, Object>> preferenceObjects;
     
-    private transient Map<String, Set<PreferenceObjectListener<? extends Object>>> listeners;
+    private transient Map<String, Set<PreferenceObjectListener<?>>> listeners;
     
     /**
      * Won't be serialized and remains <code>null</code> on the de-serializing end.
@@ -532,8 +532,8 @@ public class UserStoreImpl implements UserStore {
     @Override
     public void registerPreferenceConverter(String preferenceKey, PreferenceConverter<?> converter) {
         PreferenceConverter<?> alreadyAssociatedConverter = preferenceConverters.putIfAbsent(preferenceKey, converter);
-        
-        if(alreadyAssociatedConverter == null) {
+
+        if (alreadyAssociatedConverter == null) {
             final Set<String> usersToProcess = new HashSet<>(preferences.keySet());
             for (String user : usersToProcess) {
                 loadPreferenceWithConverter(user, preferenceKey, converter);
@@ -605,7 +605,7 @@ public class UserStoreImpl implements UserStore {
     }
     
     @Override
-    public <T> void setPreferenceObject(String username, String key, Object preferenceObject)
+    public void setPreferenceObject(String username, String key, Object preferenceObject)
             throws IllegalArgumentException {
         @SuppressWarnings("unchecked")
         PreferenceConverter<Object> preferenceConverter = (PreferenceConverter<Object>) preferenceConverters.get(key);
diff --git a/java/com.sap.sse.security/src/com/sap/sse/security/UserStore.java b/java/com.sap.sse.security/src/com/sap/sse/security/UserStore.java
index b47c7227075..672fa71ef0e 100644
--- a/java/com.sap.sse.security/src/com/sap/sse/security/UserStore.java
+++ b/java/com.sap.sse.security/src/com/sap/sse/security/UserStore.java
@@ -76,7 +76,7 @@ public interface UserStore extends Named {
      * 
      * @throws IllegalArgumentException if there is no {@link PreferenceConverter} registered with the given key.
      */
-    <T> void setPreferenceObject(String username, String key, Object preferenceObject) throws IllegalArgumentException;
+    void setPreferenceObject(String username, String key, Object preferenceObject) throws IllegalArgumentException;
 
     /**
      * Sets a value for a key if that key was previously added to this store using {@link #addSetting(String, Class)}.