diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/config/MongoJmxParser.java b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/config/MongoJmxParser.java
index dcba033e1..5ffa9bbf9 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/config/MongoJmxParser.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/config/MongoJmxParser.java
@@ -57,7 +57,7 @@ public class MongoJmxParser implements BeanDefinitionParser {
 
   }
 
-  protected void createBeanDefEntry(Class clazz, CompositeComponentDefinition compositeDef, String mongoRefName, Object eleSource, ParserContext parserContext) {
+  protected void createBeanDefEntry(Class<?> clazz, CompositeComponentDefinition compositeDef, String mongoRefName, Object eleSource, ParserContext parserContext) {
     BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(clazz);
     builder.getRawBeanDefinition().setSource(eleSource);
     builder.addConstructorArgReference(mongoRefName);
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/convert/SimpleMongoConverter.java b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/convert/SimpleMongoConverter.java
index 11661eed6..74a370496 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/convert/SimpleMongoConverter.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/convert/SimpleMongoConverter.java
@@ -51,6 +51,7 @@ import org.springframework.util.comparator.CompoundComparator;
 public class SimpleMongoConverter implements MongoConverter {
 
   private static final Log LOG = LogFactory.getLog(SimpleMongoConverter.class);
+  @SuppressWarnings("unchecked")
   private static final List<Class<?>> MONGO_TYPES = Arrays.asList(Number.class, Date.class, String.class, DBObject.class);
   private static final Set<String> SIMPLE_TYPES;
 
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/event/CollectionCreatedEvent.java b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/event/CollectionCreatedEvent.java
index a07356fc8..e4ac468be 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/event/CollectionCreatedEvent.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/event/CollectionCreatedEvent.java
@@ -24,6 +24,7 @@ import org.springframework.context.ApplicationEvent;
  */
 public class CollectionCreatedEvent extends ApplicationEvent {
 
+  private static final long serialVersionUID = -7258679124450904006L;
   private final DBObject options;
 
   public CollectionCreatedEvent(String collection, DBObject options) {
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/event/InsertEvent.java b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/event/InsertEvent.java
index 94121ff05..bb01b8356 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/event/InsertEvent.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/event/InsertEvent.java
@@ -24,6 +24,7 @@ import org.springframework.context.ApplicationEvent;
  */
 public class InsertEvent extends ApplicationEvent {
 
+  private static final long serialVersionUID = 8713413423411L;
   private final String collection;
 
   public InsertEvent(String collection, DBObject dbo) {
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/event/SaveEvent.java b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/event/SaveEvent.java
index c9e40b765..74ef00984 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/event/SaveEvent.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/event/SaveEvent.java
@@ -24,6 +24,7 @@ import org.springframework.context.ApplicationEvent;
  */
 public class SaveEvent extends ApplicationEvent {
 
+  private static final long serialVersionUID = -5583681211168904206L;
   private final String collection;
 
   public SaveEvent(String collection, DBObject source) {
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/event/WriteResultEvent.java b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/event/WriteResultEvent.java
index bfbedc9c7..3341bfbaf 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/event/WriteResultEvent.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/event/WriteResultEvent.java
@@ -24,6 +24,8 @@ import org.springframework.context.ApplicationEvent;
  */
 public class WriteResultEvent extends ApplicationEvent {
 
+  private static final long serialVersionUID = 4460770341573211038L;
+
   public WriteResultEvent(WriteResult result) {
     super(result);
   }
@@ -31,5 +33,4 @@ public class WriteResultEvent extends ApplicationEvent {
   public WriteResult getWriteResult() {
     return (WriteResult) source;
   }
-
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/mapping/event/MongoMappingEvent.java b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/mapping/event/MongoMappingEvent.java
index f422a651c..3236821eb 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/mapping/event/MongoMappingEvent.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/mapping/event/MongoMappingEvent.java
@@ -24,7 +24,8 @@ import org.springframework.data.mapping.model.PersistentEntity;
  * @author Jon Brisbin <jbrisbin@vmware.com>
  */
 public class MongoMappingEvent<T> extends ApplicationEvent {
-
+  
+  private static final long serialVersionUID = 1L;
   private final EventType type;
   private final PersistentEntity<T> entity;
 
@@ -43,6 +44,7 @@ public class MongoMappingEvent<T> extends ApplicationEvent {
   }
 
   @Override
+  @SuppressWarnings("unchecked")
   public T getSource() {
     return (T) super.getSource();
   }