diff --git a/spring-platform-netflix-core/src/main/java/org/springframework/platform/netflix/eureka/event/EurekaInstanceCanceledEvent.java b/spring-platform-netflix-core/src/main/java/org/springframework/platform/netflix/eureka/event/EurekaInstanceCanceledEvent.java
index f3721c8e..76cc86d7 100644
--- a/spring-platform-netflix-core/src/main/java/org/springframework/platform/netflix/eureka/event/EurekaInstanceCanceledEvent.java
+++ b/spring-platform-netflix-core/src/main/java/org/springframework/platform/netflix/eureka/event/EurekaInstanceCanceledEvent.java
@@ -1,12 +1,16 @@
 package org.springframework.platform.netflix.eureka.event;
 
 import lombok.Data;
+import lombok.EqualsAndHashCode;
+
 import org.springframework.context.ApplicationEvent;
 
 /**
  * @author Spencer Gibb
  */
 @Data
+@EqualsAndHashCode(callSuper=false)
+@SuppressWarnings("serial")
 public class EurekaInstanceCanceledEvent extends ApplicationEvent {
     private String appName;
     private String serverId;
diff --git a/spring-platform-netflix-core/src/main/java/org/springframework/platform/netflix/eureka/event/EurekaInstanceRegisteredEvent.java b/spring-platform-netflix-core/src/main/java/org/springframework/platform/netflix/eureka/event/EurekaInstanceRegisteredEvent.java
index ef5630f6..a07156b0 100644
--- a/spring-platform-netflix-core/src/main/java/org/springframework/platform/netflix/eureka/event/EurekaInstanceRegisteredEvent.java
+++ b/spring-platform-netflix-core/src/main/java/org/springframework/platform/netflix/eureka/event/EurekaInstanceRegisteredEvent.java
@@ -1,13 +1,18 @@
 package org.springframework.platform.netflix.eureka.event;
 
 import com.netflix.appinfo.InstanceInfo;
+
 import lombok.Data;
+import lombok.EqualsAndHashCode;
+
 import org.springframework.context.ApplicationEvent;
 
 /**
  * @author Spencer Gibb
  */
 @Data
+@EqualsAndHashCode(callSuper=false)
+@SuppressWarnings("serial")
 public class EurekaInstanceRegisteredEvent extends ApplicationEvent {
     private InstanceInfo instanceInfo;
     private int leaseDuration;
diff --git a/spring-platform-netflix-core/src/main/java/org/springframework/platform/netflix/eureka/event/EurekaInstanceRenewedEvent.java b/spring-platform-netflix-core/src/main/java/org/springframework/platform/netflix/eureka/event/EurekaInstanceRenewedEvent.java
index be0d83f7..90967c61 100644
--- a/spring-platform-netflix-core/src/main/java/org/springframework/platform/netflix/eureka/event/EurekaInstanceRenewedEvent.java
+++ b/spring-platform-netflix-core/src/main/java/org/springframework/platform/netflix/eureka/event/EurekaInstanceRenewedEvent.java
@@ -1,13 +1,18 @@
 package org.springframework.platform.netflix.eureka.event;
 
 import com.netflix.appinfo.InstanceInfo;
+
 import lombok.Data;
+import lombok.EqualsAndHashCode;
+
 import org.springframework.context.ApplicationEvent;
 
 /**
  * @author Spencer Gibb
  */
 @Data
+@EqualsAndHashCode(callSuper=false)
+@SuppressWarnings("serial")
 public class EurekaInstanceRenewedEvent extends ApplicationEvent {
     private String appName;
     private String serverId;
diff --git a/spring-platform-netflix-core/src/main/java/org/springframework/platform/netflix/eureka/event/LeaseManagerMessageBroker.java b/spring-platform-netflix-core/src/main/java/org/springframework/platform/netflix/eureka/event/LeaseManagerMessageBroker.java
index 08b6c767..16351e67 100644
--- a/spring-platform-netflix-core/src/main/java/org/springframework/platform/netflix/eureka/event/LeaseManagerMessageBroker.java
+++ b/spring-platform-netflix-core/src/main/java/org/springframework/platform/netflix/eureka/event/LeaseManagerMessageBroker.java
@@ -1,21 +1,22 @@
 package org.springframework.platform.netflix.eureka.event;
 
-import com.google.common.base.Optional;
-import com.google.common.base.Predicate;
-import com.netflix.appinfo.InstanceInfo;
-import com.netflix.discovery.DiscoveryManager;
-import com.netflix.discovery.shared.Application;
-import com.netflix.eureka.PeerAwareInstanceRegistry;
-import com.netflix.eureka.lease.LeaseManager;
+import static com.google.common.collect.Iterables.tryFind;
+
+import java.util.List;
+
+import javax.annotation.Nullable;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 
-import javax.annotation.Nullable;
-import java.util.List;
-
-import static com.google.common.collect.Iterables.*;
+import com.google.common.base.Optional;
+import com.google.common.base.Predicate;
+import com.netflix.appinfo.InstanceInfo;
+import com.netflix.discovery.shared.Application;
+import com.netflix.eureka.PeerAwareInstanceRegistry;
+import com.netflix.eureka.lease.LeaseManager;
 
 /**
  * @author Spencer Gibb
diff --git a/spring-platform-netflix-core/src/main/java/org/springframework/platform/netflix/zuul/FilterIntializer.java b/spring-platform-netflix-core/src/main/java/org/springframework/platform/netflix/zuul/FilterIntializer.java
index 4bcbe67d..f68716b7 100644
--- a/spring-platform-netflix-core/src/main/java/org/springframework/platform/netflix/zuul/FilterIntializer.java
+++ b/spring-platform-netflix-core/src/main/java/org/springframework/platform/netflix/zuul/FilterIntializer.java
@@ -1,20 +1,17 @@
 package org.springframework.platform.netflix.zuul;
 
-import com.netflix.zuul.FilterFileManager;
-import com.netflix.zuul.FilterLoader;
-import com.netflix.zuul.ZuulFilter;
-import com.netflix.zuul.filters.FilterRegistry;
-import com.netflix.zuul.groovy.GroovyCompiler;
-import com.netflix.zuul.groovy.GroovyFileFilter;
-import com.netflix.zuul.monitoring.MonitoringHelper;
+import java.util.Map;
+
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
-import java.util.List;
-import java.util.Map;
+import com.netflix.zuul.ZuulFilter;
+import com.netflix.zuul.filters.FilterRegistry;
+import com.netflix.zuul.monitoring.MonitoringHelper;
 
 /**
  * User: spencergibb
diff --git a/spring-platform-netflix-core/src/main/java/org/springframework/platform/netflix/zuul/filters/post/SendResponseFilter.java b/spring-platform-netflix-core/src/main/java/org/springframework/platform/netflix/zuul/filters/post/SendResponseFilter.java
index b2ab31f7..535565cd 100644
--- a/spring-platform-netflix-core/src/main/java/org/springframework/platform/netflix/zuul/filters/post/SendResponseFilter.java
+++ b/spring-platform-netflix-core/src/main/java/org/springframework/platform/netflix/zuul/filters/post/SendResponseFilter.java
@@ -2,7 +2,6 @@ package org.springframework.platform.netflix.zuul.filters.post;
 
 import com.google.common.base.Throwables;
 import com.netflix.config.DynamicBooleanProperty;
-
 import com.netflix.config.DynamicIntProperty;
 import com.netflix.config.DynamicPropertyFactory;
 import com.netflix.util.Pair;
@@ -13,6 +12,7 @@ import com.netflix.zuul.context.Debug;
 import com.netflix.zuul.context.RequestContext;
 
 import javax.servlet.http.HttpServletResponse;
+
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -143,7 +143,8 @@ public class SendResponseFilter extends ZuulFilter {
         List<Pair<String, String>> zuulResponseHeaders = context.getZuulResponseHeaders();
         String debugHeader = "";
 
-        List<String> rd = (List<String>) RequestContext.getCurrentContext().get("routingDebug");
+        @SuppressWarnings("unchecked")
+		List<String> rd = (List<String>) RequestContext.getCurrentContext().get("routingDebug");
         for (String it : rd) {
             debugHeader += "[[["+it+"]]]";
         }
diff --git a/spring-platform-netflix-core/src/main/java/org/springframework/platform/netflix/zuul/filters/post/StatsFilter.java b/spring-platform-netflix-core/src/main/java/org/springframework/platform/netflix/zuul/filters/post/StatsFilter.java
index d3959000..5fc2a944 100644
--- a/spring-platform-netflix-core/src/main/java/org/springframework/platform/netflix/zuul/filters/post/StatsFilter.java
+++ b/spring-platform-netflix-core/src/main/java/org/springframework/platform/netflix/zuul/filters/post/StatsFilter.java
@@ -1,7 +1,6 @@
 package org.springframework.platform.netflix.zuul.filters.post;
 
 import com.netflix.zuul.ZuulFilter;
-
 import com.netflix.zuul.context.RequestContext;
 
 import java.util.List;
@@ -30,7 +29,8 @@ public class StatsFilter extends ZuulFilter {
     }
 
     public void dumpRequestDebug() {
-        List<String> rd = (List<String>) RequestContext.getCurrentContext().get("requestDebug");
+        @SuppressWarnings("unchecked")
+		List<String> rd = (List<String>) RequestContext.getCurrentContext().get("requestDebug");
         if (rd != null) {
             for (String it : rd) {
                 System.out.println("REQUEST_DEBUG::" + it);
@@ -39,7 +39,8 @@ public class StatsFilter extends ZuulFilter {
     }
 
     public void dumpRoutingDebug() {
-        List<String> rd = (List<String>) RequestContext.getCurrentContext().get("routingDebug");
+        @SuppressWarnings("unchecked")
+		List<String> rd = (List<String>) RequestContext.getCurrentContext().get("routingDebug");
         if (rd != null) {
             for (String it : rd) {
                 System.out.println("ZUUL_DEBUG::"+it);
diff --git a/spring-platform-netflix-core/src/main/java/org/springframework/platform/netflix/zuul/filters/route/RibbonRoutingFilter.java b/spring-platform-netflix-core/src/main/java/org/springframework/platform/netflix/zuul/filters/route/RibbonRoutingFilter.java
index b937fc24..1be17871 100644
--- a/spring-platform-netflix-core/src/main/java/org/springframework/platform/netflix/zuul/filters/route/RibbonRoutingFilter.java
+++ b/spring-platform-netflix-core/src/main/java/org/springframework/platform/netflix/zuul/filters/route/RibbonRoutingFilter.java
@@ -176,7 +176,7 @@ public class RibbonRoutingFilter extends ZuulFilter {
         RequestContext context = RequestContext.getCurrentContext();
 
         MultivaluedMap<String, String> headers = new MultivaluedMapImpl();
-        Enumeration headerNames = request.getHeaderNames();
+        Enumeration<?> headerNames = request.getHeaderNames();
         if (headerNames != null) {
             while (headerNames.hasMoreElements()) {
                 String name = (String) headerNames.nextElement();