diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/mood/MoodManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/mood/MoodManager.java
index a341bffcc..27f270ae8 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/mood/MoodManager.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/mood/MoodManager.java
@@ -91,7 +91,7 @@ public final class MoodManager extends Manager {
                     @Override
                     public void run() {
                         ItemsExtension items = (ItemsExtension) event.getExtensions().get(0);
-                        PayloadItem<?> payload = (PayloadItem) items.getItems().get(0);
+                        PayloadItem<?> payload = (PayloadItem<?>) items.getItems().get(0);
                         MoodElement mood = (MoodElement) payload.getPayload();
 
                         for (MoodListener listener : moodListeners) {
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/mood/provider/MoodProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/mood/provider/MoodProvider.java
index c9814b091..e23234d69 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/mood/provider/MoodProvider.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/mood/provider/MoodProvider.java
@@ -57,7 +57,7 @@ public class MoodProvider extends ExtensionElementProvider<MoodElement> {
 
                     if (!MoodElement.NAMESPACE.equals(namespace)) {
                         LOGGER.log(Level.FINE, "Foreign namespace " + namespace + " detected. Try to find suitable MoodConcretisationProvider.");
-                        MoodConcretisationProvider<?> provider = (MoodConcretisationProvider) ProviderManager.getExtensionProvider(name, namespace);
+                        MoodConcretisationProvider<?> provider = (MoodConcretisationProvider<?>) ProviderManager.getExtensionProvider(name, namespace);
                         if (provider != null) {
                             concretisation = provider.parse(parser);
                         } else {
diff --git a/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/OpenPgpManager.java b/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/OpenPgpManager.java
index bc8184799..d16296a05 100644
--- a/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/OpenPgpManager.java
+++ b/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/OpenPgpManager.java
@@ -512,7 +512,7 @@ public final class OpenPgpManager extends Manager {
                     @Override
                     public void run() {
                         ItemsExtension items = (ItemsExtension) event.getExtensions().get(0);
-                        PayloadItem<?> payload = (PayloadItem) items.getItems().get(0);
+                        PayloadItem<?> payload = (PayloadItem<?>) items.getItems().get(0);
                         PublicKeysListElement listElement = (PublicKeysListElement) payload.getPayload();
 
                         processPublicKeysListElement(from, listElement);
diff --git a/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/util/OpenPgpPubSubUtil.java b/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/util/OpenPgpPubSubUtil.java
index cbe0bd4c2..89be5eb65 100644
--- a/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/util/OpenPgpPubSubUtil.java
+++ b/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/util/OpenPgpPubSubUtil.java
@@ -430,7 +430,7 @@ public class OpenPgpPubSubUtil {
             // Get access to the PubSubManager's nodeMap
             Field field = pubSubManager.getClass().getDeclaredField("nodeMap");
             field.setAccessible(true);
-            Map<String, Node> nodeMap = (Map) field.get(pubSubManager);
+            Map<String, Node> nodeMap = (Map<String, Node>) field.get(pubSubManager);
 
             // Check, if the node already exists
             Node existingNode = nodeMap.get(nodeName);