diff --git a/src/main/java/org/springframework/cloud/bus/BusAutoConfiguration.java b/src/main/java/org/springframework/cloud/bus/BusAutoConfiguration.java
index d5d2101..6f57042 100644
--- a/src/main/java/org/springframework/cloud/bus/BusAutoConfiguration.java
+++ b/src/main/java/org/springframework/cloud/bus/BusAutoConfiguration.java
@@ -1,12 +1,8 @@
 package org.springframework.cloud.bus;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.cloud.bus.endpoint.BusEndpoint;
 import org.springframework.cloud.bus.endpoint.EnvironmentBusEndpoint;
 import org.springframework.cloud.bus.endpoint.RefreshBusEndpoint;
@@ -14,6 +10,8 @@ import org.springframework.cloud.bus.event.EnvironmentChangeListener;
 import org.springframework.cloud.bus.event.RefreshListener;
 import org.springframework.cloud.config.client.RefreshEndpoint;
 import org.springframework.cloud.context.environment.EnvironmentManager;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
 
 /**
  * @author Spencer Gibb
@@ -21,7 +19,6 @@ import org.springframework.cloud.context.environment.EnvironmentManager;
 @Configuration
 @ConditionalOnExpression("${bus.enabled:true}")
 public class BusAutoConfiguration {
-    private static final Logger logger = LoggerFactory.getLogger(BusAutoConfiguration.class);
 
     @Bean
     public BusEndpoint busEndpoint() {
diff --git a/src/main/java/org/springframework/cloud/bus/amqp/AmqpBusAutoConfiguration.java b/src/main/java/org/springframework/cloud/bus/amqp/AmqpBusAutoConfiguration.java
index 9da7d8d..c811402 100644
--- a/src/main/java/org/springframework/cloud/bus/amqp/AmqpBusAutoConfiguration.java
+++ b/src/main/java/org/springframework/cloud/bus/amqp/AmqpBusAutoConfiguration.java
@@ -1,12 +1,15 @@
 package org.springframework.cloud.bus.amqp;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.amqp.core.*;
+import org.springframework.amqp.core.AmqpAdmin;
+import org.springframework.amqp.core.AmqpTemplate;
+import org.springframework.amqp.core.BindingBuilder;
+import org.springframework.amqp.core.FanoutExchange;
+import org.springframework.amqp.core.Queue;
 import org.springframework.amqp.rabbit.connection.ConnectionFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
+import org.springframework.cloud.bus.event.RemoteApplicationEvent;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.env.ConfigurableEnvironment;
@@ -22,7 +25,6 @@ import org.springframework.integration.dsl.channel.MessageChannels;
 import org.springframework.integration.event.inbound.ApplicationEventListeningMessageProducer;
 import org.springframework.integration.event.outbound.ApplicationEventPublishingMessageHandler;
 import org.springframework.integration.handler.LoggingHandler;
-import org.springframework.cloud.bus.event.RemoteApplicationEvent;
 
 /**
  * @author Spencer Gibb
@@ -31,7 +33,7 @@ import org.springframework.cloud.bus.event.RemoteApplicationEvent;
 @ConditionalOnClass(AmqpTemplate.class)
 @ConditionalOnExpression("${bus.amqp.enabled:true}")
 public class AmqpBusAutoConfiguration {
-    private static final Logger logger = LoggerFactory.getLogger(AmqpBusAutoConfiguration.class);
+
     public static final String SPRING_PLATFORM_BUS = "spring.platform.bus";
 
     @Autowired
@@ -62,7 +64,8 @@ public class AmqpBusAutoConfiguration {
         return queue;
     }
 
-    @Bean
+    @SuppressWarnings("unchecked")
+	@Bean
     public ApplicationEventListeningMessageProducer platformBusProducer() {
         ApplicationEventListeningMessageProducer producer = new ApplicationEventListeningMessageProducer();
         producer.setEventTypes(RemoteApplicationEvent.class);
@@ -80,7 +83,7 @@ public class AmqpBusAutoConfiguration {
 
     //TODO: is there a way to move these filters to rabbit while not loosing the information once it is published to spring?
     @Bean
-    public GenericSelector outboundFilter() {
+    public GenericSelector<?> outboundFilter() {
         return new GenericSelector<RemoteApplicationEvent>() {
             @Override
             public boolean accept(RemoteApplicationEvent source) {
@@ -90,7 +93,7 @@ public class AmqpBusAutoConfiguration {
     }
 
     @Bean
-    public GenericSelector inboundFilter() {
+    public GenericSelector<?> inboundFilter() {
         return new GenericSelector<RemoteApplicationEvent>() {
             @Override
             public boolean accept(RemoteApplicationEvent event) {
diff --git a/src/main/java/org/springframework/cloud/bus/endpoint/BusEndpoint.java b/src/main/java/org/springframework/cloud/bus/endpoint/BusEndpoint.java
index 4190f68..31e22df 100644
--- a/src/main/java/org/springframework/cloud/bus/endpoint/BusEndpoint.java
+++ b/src/main/java/org/springframework/cloud/bus/endpoint/BusEndpoint.java
@@ -18,6 +18,6 @@ public class BusEndpoint extends AbstractEndpoint<Collection<String>>/* implemen
 
     @Override
     public Collection<String> invoke() {
-        return Collections.EMPTY_LIST;
+        return Collections.emptyList();
     }
 }
diff --git a/src/main/java/org/springframework/cloud/bus/event/EnvironmentChangeRemoteApplicationEvent.java b/src/main/java/org/springframework/cloud/bus/event/EnvironmentChangeRemoteApplicationEvent.java
index 530740a..dcc4982 100644
--- a/src/main/java/org/springframework/cloud/bus/event/EnvironmentChangeRemoteApplicationEvent.java
+++ b/src/main/java/org/springframework/cloud/bus/event/EnvironmentChangeRemoteApplicationEvent.java
@@ -1,15 +1,19 @@
 package org.springframework.cloud.bus.event;
 
-import lombok.Data;
-
 import java.util.Map;
 
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
 /**
  * @author Spencer Gibb
  */
+@SuppressWarnings("serial")
 @Data
+@EqualsAndHashCode(callSuper=false)
 public class EnvironmentChangeRemoteApplicationEvent extends RemoteApplicationEvent {
-    private final Map<String, String> values;
+
+	private final Map<String, String> values;
 
     public EnvironmentChangeRemoteApplicationEvent(Object source, String originService,
                                                    String destinationService,
@@ -17,4 +21,5 @@ public class EnvironmentChangeRemoteApplicationEvent extends RemoteApplicationEv
         super(source, originService, destinationService);
         this.values = values;
     }
+
 }
diff --git a/src/main/java/org/springframework/cloud/bus/event/RefreshRemoteApplicationEvent.java b/src/main/java/org/springframework/cloud/bus/event/RefreshRemoteApplicationEvent.java
index f7bf6c4..899226f 100644
--- a/src/main/java/org/springframework/cloud/bus/event/RefreshRemoteApplicationEvent.java
+++ b/src/main/java/org/springframework/cloud/bus/event/RefreshRemoteApplicationEvent.java
@@ -3,6 +3,7 @@ package org.springframework.cloud.bus.event;
 /**
  * @author Spencer Gibb
  */
+@SuppressWarnings("serial")
 public class RefreshRemoteApplicationEvent extends RemoteApplicationEvent {
     public RefreshRemoteApplicationEvent(Object source, String originService, String destinationService) {
         super(source, originService, destinationService);
diff --git a/src/main/java/org/springframework/cloud/bus/event/RemoteApplicationEvent.java b/src/main/java/org/springframework/cloud/bus/event/RemoteApplicationEvent.java
index fe96cb8..c27f6a3 100644
--- a/src/main/java/org/springframework/cloud/bus/event/RemoteApplicationEvent.java
+++ b/src/main/java/org/springframework/cloud/bus/event/RemoteApplicationEvent.java
@@ -1,12 +1,16 @@
 package org.springframework.cloud.bus.event;
 
 import lombok.Data;
+import lombok.EqualsAndHashCode;
+
 import org.springframework.context.ApplicationEvent;
 
 /**
  * @author Spencer Gibb
  */
+@SuppressWarnings("serial")
 @Data
+@EqualsAndHashCode(callSuper=false)
 public class RemoteApplicationEvent extends ApplicationEvent {
     private final String originService;
     private final String destinationService;
diff --git a/src/main/java/org/springframework/cloud/notcfconfig/NotCFConfigConnector.java b/src/main/java/org/springframework/cloud/notcfconfig/NotCFConfigConnector.java
index bd0ba15..2df6457 100644
--- a/src/main/java/org/springframework/cloud/notcfconfig/NotCFConfigConnector.java
+++ b/src/main/java/org/springframework/cloud/notcfconfig/NotCFConfigConnector.java
@@ -9,7 +9,7 @@ import java.util.List;
 
 /**
  * @author Spencer Gibb
- * Let's spring boots current auto-configuration work, effectivly disabling spring cloud local
+ * Lets spring boot auto-configuration work, effectively disabling spring cloud local
  * TODO: workaround for not having to configure the local cloud connector
  */
 public class NotCFConfigConnector extends LocalConfigConnector {