diff --git a/ProtocolLib/dependency-reduced-pom.xml b/ProtocolLib/dependency-reduced-pom.xml
index cd545d8c..a59d86f0 100644
--- a/ProtocolLib/dependency-reduced-pom.xml
+++ b/ProtocolLib/dependency-reduced-pom.xml
@@ -73,6 +73,15 @@
           <target>1.6</target>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>findbugs-maven-plugin</artifactId>
+        <version>2.5.2</version>
+        <configuration>
+          <threshold>High</threshold>
+          <effort>Default</effort>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
   <profiles>
diff --git a/ProtocolLib/pom.xml b/ProtocolLib/pom.xml
index 7e1c3e45..aa27fda7 100644
--- a/ProtocolLib/pom.xml
+++ b/ProtocolLib/pom.xml
@@ -74,9 +74,24 @@
           <target>1.6</target>
         </configuration>
       </plugin>
+
     </plugins>
   </build>
   
+  <reporting>
+    <plugins>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>findbugs-maven-plugin</artifactId>
+        <version>2.5.2</version>
+          <configuration>
+            <threshold>High</threshold>
+            <effort>Default</effort>
+          </configuration>
+      </plugin>
+    </plugins>
+  </reporting>
+  
   <profiles>
   <profile>
     <id>release-sign-artifacts</id>
diff --git a/ProtocolLib/src/main/java/com/comphenix/protocol/async/AsyncMarker.java b/ProtocolLib/src/main/java/com/comphenix/protocol/async/AsyncMarker.java
index 1481f090..36843939 100644
--- a/ProtocolLib/src/main/java/com/comphenix/protocol/async/AsyncMarker.java
+++ b/ProtocolLib/src/main/java/com/comphenix/protocol/async/AsyncMarker.java
@@ -95,8 +95,8 @@ public class AsyncMarker implements Serializable, Comparable<AsyncMarker> {
 	private Object processingLock = new Object();
 	
 	// Used to identify the asynchronous worker
-	private AsyncListenerHandler listenerHandler;
-	private int workerID;
+	private transient AsyncListenerHandler listenerHandler;
+	private transient int workerID;
 	
 	// Determine if Minecraft processes this packet asynchronously
 	private static Method isMinecraftAsync;
diff --git a/ProtocolLib/src/main/java/com/comphenix/protocol/events/ListeningWhitelist.java b/ProtocolLib/src/main/java/com/comphenix/protocol/events/ListeningWhitelist.java
index 979c8ec6..04dd6af9 100644
--- a/ProtocolLib/src/main/java/com/comphenix/protocol/events/ListeningWhitelist.java
+++ b/ProtocolLib/src/main/java/com/comphenix/protocol/events/ListeningWhitelist.java
@@ -33,7 +33,7 @@ public class ListeningWhitelist {
 	/**
 	 * A whitelist with no packets - indicates that the listener shouldn't observe any packets.
 	 */
-	public static ListeningWhitelist EMPTY_WHITELIST = new ListeningWhitelist(ListenerPriority.LOW);
+	public static final ListeningWhitelist EMPTY_WHITELIST = new ListeningWhitelist(ListenerPriority.LOW);
 	
 	private ListenerPriority priority;
 	private Set<Integer> whitelist;
diff --git a/ProtocolLib/src/main/java/com/comphenix/protocol/injector/PacketConstructor.java b/ProtocolLib/src/main/java/com/comphenix/protocol/injector/PacketConstructor.java
index 04e875f4..c00c7f72 100644
--- a/ProtocolLib/src/main/java/com/comphenix/protocol/injector/PacketConstructor.java
+++ b/ProtocolLib/src/main/java/com/comphenix/protocol/injector/PacketConstructor.java
@@ -40,7 +40,7 @@ public class PacketConstructor {
 	 * <p>
 	 * Remember to call withPacket().
 	 */
-	public static PacketConstructor DEFAULT = new PacketConstructor(null);
+	public static final PacketConstructor DEFAULT = new PacketConstructor(null);
 	
 	// The constructor method that's actually responsible for creating the packet
 	private Constructor<?> constructorMethod;
diff --git a/ProtocolLib/src/main/java/com/comphenix/protocol/reflect/FuzzyReflection.java b/ProtocolLib/src/main/java/com/comphenix/protocol/reflect/FuzzyReflection.java
index 468b42d8..ae986fdb 100644
--- a/ProtocolLib/src/main/java/com/comphenix/protocol/reflect/FuzzyReflection.java
+++ b/ProtocolLib/src/main/java/com/comphenix/protocol/reflect/FuzzyReflection.java
@@ -36,7 +36,7 @@ public class FuzzyReflection {
 	/**
 	 * Matches a Minecraft object.
 	 */
-	public static String MINECRAFT_OBJECT = "net\\.minecraft(\\.\\w+)+";
+	public static final String MINECRAFT_OBJECT = "net\\.minecraft(\\.\\w+)+";
 	
 	// The class we're actually representing
 	private Class<?> source;
diff --git a/ProtocolLib/src/main/java/com/comphenix/protocol/reflect/instances/CollectionGenerator.java b/ProtocolLib/src/main/java/com/comphenix/protocol/reflect/instances/CollectionGenerator.java
index 24e14649..674565dc 100644
--- a/ProtocolLib/src/main/java/com/comphenix/protocol/reflect/instances/CollectionGenerator.java
+++ b/ProtocolLib/src/main/java/com/comphenix/protocol/reflect/instances/CollectionGenerator.java
@@ -42,7 +42,7 @@ public class CollectionGenerator implements InstanceProvider {
 	/**
 	 * Shared instance of this generator.
 	 */
-	public static CollectionGenerator INSTANCE = new CollectionGenerator();
+	public static final CollectionGenerator INSTANCE = new CollectionGenerator();
 	
 	@Override
 	public Object create(@Nullable Class<?> type) {
diff --git a/ProtocolLib/src/main/java/com/comphenix/protocol/reflect/instances/DefaultInstances.java b/ProtocolLib/src/main/java/com/comphenix/protocol/reflect/instances/DefaultInstances.java
index 56ca753e..46505891 100644
--- a/ProtocolLib/src/main/java/com/comphenix/protocol/reflect/instances/DefaultInstances.java
+++ b/ProtocolLib/src/main/java/com/comphenix/protocol/reflect/instances/DefaultInstances.java
@@ -35,7 +35,7 @@ public class DefaultInstances {
 	/**
 	 * Standard default instance provider.
 	 */
-	public static DefaultInstances DEFAULT = DefaultInstances.fromArray(
+	public static final DefaultInstances DEFAULT = DefaultInstances.fromArray(
 			PrimitiveGenerator.INSTANCE, CollectionGenerator.INSTANCE);
 		
 	/**