diff --git a/ProtocolLib/src/main/java/com/comphenix/protocol/events/NetworkMarker.java b/ProtocolLib/src/main/java/com/comphenix/protocol/events/NetworkMarker.java
index 1e990e40..0ff7a79e 100644
--- a/ProtocolLib/src/main/java/com/comphenix/protocol/events/NetworkMarker.java
+++ b/ProtocolLib/src/main/java/com/comphenix/protocol/events/NetworkMarker.java
@@ -338,8 +338,9 @@ public abstract class NetworkMarker {
 	 * Return an input stream without the header in the current packet.
 	 * <p>
 	 * It's safe to modify the input stream.
-	 * @throws IOException If integer reading fails
+	 * @param input - input stream
 	 * @return An input stream without the header
+	 * @throws IOException If integer reading fails
 	 */
 	protected abstract DataInputStream skipHeader(DataInputStream input) throws IOException;
 	
diff --git a/ProtocolLib/src/main/java/com/comphenix/protocol/utility/SafeCacheBuilder.java b/ProtocolLib/src/main/java/com/comphenix/protocol/utility/SafeCacheBuilder.java
index bf3bd24e..684da6d8 100644
--- a/ProtocolLib/src/main/java/com/comphenix/protocol/utility/SafeCacheBuilder.java
+++ b/ProtocolLib/src/main/java/com/comphenix/protocol/utility/SafeCacheBuilder.java
@@ -209,6 +209,8 @@ public class SafeCacheBuilder<K, V> {
 	 * incompatible with the listener, you will likely experience a
 	 * {@link ClassCastException} at some <i>undefined</i> point in the future.
 	 * 
+	 * @param <K1> Key type
+	 * @param <V1> Value type
 	 * @param listener - removal listener
 	 * @return This for chaining
 	 * 
@@ -307,7 +309,10 @@ public class SafeCacheBuilder<K, V> {
 	 * Returns the cache wrapped as a ConcurrentMap.
 	 * <p>
 	 * We can't return the direct Cache instance as it changed in Guava 13.
-	 * @return The cache as a map.
+	 * @param <K1> Key type
+	 * @param <V1> Value type
+	 * @param loader - cache loader
+	 * @return The cache as a a map.
 	 */
 	@SuppressWarnings("unchecked")
 	public <K1 extends K, V1 extends V> ConcurrentMap<K1, V1> build(CacheLoader<? super K1, V1> loader) {
diff --git a/ProtocolLib/src/main/java/com/comphenix/protocol/utility/StreamSerializer.java b/ProtocolLib/src/main/java/com/comphenix/protocol/utility/StreamSerializer.java
index 4e6ee6e9..34fd9103 100644
--- a/ProtocolLib/src/main/java/com/comphenix/protocol/utility/StreamSerializer.java
+++ b/ProtocolLib/src/main/java/com/comphenix/protocol/utility/StreamSerializer.java
@@ -187,7 +187,7 @@ public class StreamSerializer {
 	 * @param input - the input stream.
 	 * @param maximumLength - the maximum length of the string.
 	 * @return The deserialized string.
-	 * @throws IOException
+	 * @throws IOException If deserializing fails
 	 */
 	public String deserializeString(@Nonnull DataInputStream input, int maximumLength) throws IOException {
 		if (input == null)
diff --git a/ProtocolLib/src/main/java/com/comphenix/protocol/wrappers/WrappedDataWatcher.java b/ProtocolLib/src/main/java/com/comphenix/protocol/wrappers/WrappedDataWatcher.java
index 368d52c0..8ef5bdac 100644
--- a/ProtocolLib/src/main/java/com/comphenix/protocol/wrappers/WrappedDataWatcher.java
+++ b/ProtocolLib/src/main/java/com/comphenix/protocol/wrappers/WrappedDataWatcher.java
@@ -338,6 +338,7 @@ public class WrappedDataWatcher extends AbstractWrapper implements Iterable<Wrap
 
 	/**
 	 * Retrieve the type of a given ID, if it's allowed to be watched.
+	 * @param id - id to get type for
 	 * @return The type using a given ID, or NULL if it cannot be watched.
 	 * @throws FieldAccessException If we cannot initialize the reflection machinery.
 	 */
diff --git a/ProtocolLib/src/main/java/com/comphenix/protocol/wrappers/nbt/NbtFactory.java b/ProtocolLib/src/main/java/com/comphenix/protocol/wrappers/nbt/NbtFactory.java
index 21eab44f..144b9424 100644
--- a/ProtocolLib/src/main/java/com/comphenix/protocol/wrappers/nbt/NbtFactory.java
+++ b/ProtocolLib/src/main/java/com/comphenix/protocol/wrappers/nbt/NbtFactory.java
@@ -444,6 +444,7 @@ public class NbtFactory {
 	
 	/**
 	 * Construct a NBT list of out an array of values.
+	 * @param <T> Type
 	 * @param name - name of this list.
 	 * @param elements - elements to add.
 	 * @return The new filled NBT list.
@@ -454,6 +455,7 @@ public class NbtFactory {
 	
 	/**
 	 * Construct a NBT list of out a list of values.
+	 * @param <T> Type
 	 * @param name - name of this list.
 	 * @param elements - elements to add.
 	 * @return The new filled NBT list.
diff --git a/ProtocolLib/src/main/java/com/comphenix/protocol/wrappers/nbt/io/NbtBinarySerializer.java b/ProtocolLib/src/main/java/com/comphenix/protocol/wrappers/nbt/io/NbtBinarySerializer.java
index 32be7b2c..0c6013f8 100644
--- a/ProtocolLib/src/main/java/com/comphenix/protocol/wrappers/nbt/io/NbtBinarySerializer.java
+++ b/ProtocolLib/src/main/java/com/comphenix/protocol/wrappers/nbt/io/NbtBinarySerializer.java
@@ -80,6 +80,7 @@ public class NbtBinarySerializer {
 	
 	/**
 	 * Write the content of a wrapped NBT tag to a stream.
+	 * @param <TType> Type
 	 * @param value - the NBT tag to write.
 	 * @param destination - the destination stream.
 	 */