diff --git a/buffer/src/main/java/io/atomix/catalyst/buffer/FileBytes.java b/buffer/src/main/java/io/atomix/catalyst/buffer/FileBytes.java
index b687079..19ceef1 100644
--- a/buffer/src/main/java/io/atomix/catalyst/buffer/FileBytes.java
+++ b/buffer/src/main/java/io/atomix/catalyst/buffer/FileBytes.java
@@ -23,7 +23,6 @@
 import java.io.RandomAccessFile;
 import java.nio.ByteOrder;
 import java.nio.channels.FileChannel;
-import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 
 /**
diff --git a/buffer/src/main/java/io/atomix/catalyst/buffer/MappedBytes.java b/buffer/src/main/java/io/atomix/catalyst/buffer/MappedBytes.java
index 7f075db..4aae7ac 100644
--- a/buffer/src/main/java/io/atomix/catalyst/buffer/MappedBytes.java
+++ b/buffer/src/main/java/io/atomix/catalyst/buffer/MappedBytes.java
@@ -23,7 +23,7 @@ public class MappedBytes extends ByteBufferBytes {
    * @param size The count of the buffer to allocate (in bytes).
    * @return The mapped buffer.
    * @throws NullPointerException If {@code file} is {@code null}
-   * @throws IllegalArgumentException If {@code count} is greater than {@link MappedMemory#MAX_SIZE}
+   * @throws IllegalArgumentException If {@code count} is greater than {@link Integer#MAX_VALUE}
    *
    * @see #allocate(java.io.File, java.nio.channels.FileChannel.MapMode, long)
    */
diff --git a/buffer/src/main/java/io/atomix/catalyst/buffer/NativeBytes.java b/buffer/src/main/java/io/atomix/catalyst/buffer/NativeBytes.java
index 4193eed..2c86da9 100644
--- a/buffer/src/main/java/io/atomix/catalyst/buffer/NativeBytes.java
+++ b/buffer/src/main/java/io/atomix/catalyst/buffer/NativeBytes.java
@@ -19,7 +19,6 @@
 import io.atomix.catalyst.buffer.util.NativeMemory;
 
 import java.nio.ByteOrder;
-import java.nio.charset.StandardCharsets;
 
 /**
  * Native bytes.
diff --git a/serializer/src/main/java/io/atomix/catalyst/serializer/Serializer.java b/serializer/src/main/java/io/atomix/catalyst/serializer/Serializer.java
index f09c5fd..d2ebf91 100644
--- a/serializer/src/main/java/io/atomix/catalyst/serializer/Serializer.java
+++ b/serializer/src/main/java/io/atomix/catalyst/serializer/Serializer.java
@@ -487,7 +487,7 @@ public Serializer register(Class<?> type, int id, TypeSerializerFactory factory)
    * Abstract serializers allow abstract types to be serialized without explicitly registering a concrete type.
    * The concept of abstract serializers differs from {@link #registerDefault(Class, TypeSerializerFactory) default serializers}
    * in that abstract serializers can be registered with a serializable type ID, and types {@link #register(Class) registered}
-   * without a specific {@link TypeSerializer} do not inheret from abstract serializers.
+   * without a specific {@link TypeSerializer} do not inherit from abstract serializers.
    * <pre>
    *   {@code
    *   serializer.registerAbstract(List.class, AbstractListSerializer.class);
@@ -512,7 +512,7 @@ public Serializer registerAbstract(Class<?> abstractType, Class<? extends TypeSe
    * Abstract serializers allow abstract types to be serialized without explicitly registering a concrete type.
    * The concept of abstract serializers differs from {@link #registerDefault(Class, TypeSerializerFactory) default serializers}
    * in that abstract serializers can be registered with a serializable type ID, and types {@link #register(Class) registered}
-   * without a specific {@link TypeSerializer} do not inheret from abstract serializers.
+   * without a specific {@link TypeSerializer} do not inherit from abstract serializers.
    * <pre>
    *   {@code
    *   serializer.registerAbstract(List.class, AbstractListSerializer.class);
@@ -537,7 +537,7 @@ public Serializer registerAbstract(Class<?> abstractType, TypeSerializerFactory
    * Abstract serializers allow abstract types to be serialized without explicitly registering a concrete type.
    * The concept of abstract serializers differs from {@link #registerDefault(Class, TypeSerializerFactory) default serializers}
    * in that abstract serializers can be registered with a serializable type ID, and types {@link #register(Class) registered}
-   * without a specific {@link TypeSerializer} do not inheret from abstract serializers.
+   * without a specific {@link TypeSerializer} do not inherit from abstract serializers.
    * <pre>
    *   {@code
    *   serializer.registerAbstract(List.class, AbstractListSerializer.class);
@@ -563,7 +563,7 @@ public Serializer registerAbstract(Class<?> abstractType, int id, Class<? extend
    * Abstract serializers allow abstract types to be serialized without explicitly registering a concrete type.
    * The concept of abstract serializers differs from {@link #registerDefault(Class, TypeSerializerFactory) default serializers}
    * in that abstract serializers can be registered with a serializable type ID, and types {@link #register(Class) registered}
-   * without a specific {@link TypeSerializer} do not inheret from abstract serializers.
+   * without a specific {@link TypeSerializer} do not inherit from abstract serializers.
    * <pre>
    *   {@code
    *   serializer.registerAbstract(List.class, AbstractListSerializer.class);