diff --git a/runtime/src/main/java/org/capnproto/ArrayInputStream.java b/runtime/src/main/java/org/capnproto/ArrayInputStream.java
index bcadb28..20d287d 100644
--- a/runtime/src/main/java/org/capnproto/ArrayInputStream.java
+++ b/runtime/src/main/java/org/capnproto/ArrayInputStream.java
@@ -33,6 +33,7 @@ public final class ArrayInputStream implements BufferedInputStream {
         this.buf = buf.asReadOnlyBuffer();
     }
 
+    @Override
     public final int read(ByteBuffer dst) throws IOException {
         int available = this.buf.remaining();
         int size = java.lang.Math.min(dst.remaining(), available);
@@ -49,14 +50,17 @@ public final class ArrayInputStream implements BufferedInputStream {
         return size;
     }
 
+    @Override
     public final ByteBuffer getReadBuffer() {
         return this.buf;
     }
 
+    @Override
     public final void close() throws IOException {
         return;
     }
 
+    @Override
     public final boolean isOpen() {
         return true;
     }
diff --git a/runtime/src/main/java/org/capnproto/ArrayOutputStream.java b/runtime/src/main/java/org/capnproto/ArrayOutputStream.java
index 2f025ba..13a1fb7 100644
--- a/runtime/src/main/java/org/capnproto/ArrayOutputStream.java
+++ b/runtime/src/main/java/org/capnproto/ArrayOutputStream.java
@@ -33,6 +33,7 @@ public final class ArrayOutputStream implements BufferedOutputStream {
         this.buf = buf.duplicate();
     }
 
+    @Override
     public final int write(ByteBuffer src) throws IOException {
         int available = this.buf.remaining();
         int size = src.remaining();
@@ -47,10 +48,12 @@ public final class ArrayOutputStream implements BufferedOutputStream {
         return this.buf;
     }
 
+    @Override
     public final void close() throws IOException {
         return;
     }
 
+    @Override
     public final boolean isOpen() {
         return true;
     }
diff --git a/runtime/src/main/java/org/capnproto/BuilderArena.java b/runtime/src/main/java/org/capnproto/BuilderArena.java
index 4c6a2d8..c345dcd 100644
--- a/runtime/src/main/java/org/capnproto/BuilderArena.java
+++ b/runtime/src/main/java/org/capnproto/BuilderArena.java
@@ -52,6 +52,7 @@ public final class BuilderArena implements Arena {
         this.segments.add(segment0);
     }
 
+    @Override
     public final SegmentReader tryGetSegment(int id) {
         return this.segments.get(id);
     }
@@ -59,6 +60,7 @@ public final class BuilderArena implements Arena {
         return this.segments.get(id);
     }
 
+    @Override
     public final void checkReadLimit(int numBytes) { }
 
     public static class AllocateResult {
diff --git a/runtime/src/main/java/org/capnproto/Data.java b/runtime/src/main/java/org/capnproto/Data.java
index 6748c09..dec6622 100644
--- a/runtime/src/main/java/org/capnproto/Data.java
+++ b/runtime/src/main/java/org/capnproto/Data.java
@@ -28,31 +28,44 @@ public final class Data {
                                       PointerFactory<Builder, Reader>,
                                       FromPointerBuilderBlobDefault<Builder>,
                                       SetPointerBuilder<Builder, Reader> {
+        @Override
         public final Reader fromPointerReaderBlobDefault(SegmentReader segment, int pointer, java.nio.ByteBuffer defaultBuffer,
                                                    int defaultOffset, int defaultSize) {
             return WireHelpers.readDataPointer(segment, pointer, defaultBuffer, defaultOffset, defaultSize);
         }
+
+        @Override
         public final Reader fromPointerReader(SegmentReader segment, int pointer, int nestingLimit) {
             return WireHelpers.readDataPointer(segment, pointer, null, 0, 0);
         }
-        public final Builder fromPointerBuilderBlobDefault(SegmentBuilder segment, int pointer,
-                                                     java.nio.ByteBuffer defaultBuffer, int defaultOffset, int defaultSize) {
+
+        @Override
+        public final Builder fromPointerBuilderBlobDefault(
+            SegmentBuilder segment,
+            int pointer,
+            java.nio.ByteBuffer defaultBuffer,
+            int defaultOffset,
+            int defaultSize) {
             return WireHelpers.getWritableDataPointer(pointer,
                                                       segment,
                                                       defaultBuffer,
                                                       defaultOffset,
                                                       defaultSize);
         }
+
+        @Override
         public final Builder fromPointerBuilder(SegmentBuilder segment, int pointer) {
             return WireHelpers.getWritableDataPointer(pointer,
                                                       segment,
                                                       null, 0, 0);
         }
 
+        @Override
         public final Builder initFromPointerBuilder(SegmentBuilder segment, int pointer, int size) {
             return WireHelpers.initDataPointer(pointer, segment, size);
         }
 
+        @Override
         public final void setPointerBuilder(SegmentBuilder segment, int pointer, Reader value) {
             WireHelpers.setDataPointer(pointer, segment, value);
         }
diff --git a/runtime/src/main/java/org/capnproto/ListList.java b/runtime/src/main/java/org/capnproto/ListList.java
index 67b6d0b..3981cbe 100644
--- a/runtime/src/main/java/org/capnproto/ListList.java
+++ b/runtime/src/main/java/org/capnproto/ListList.java
@@ -32,6 +32,7 @@ public final class ListList {
             this.factory = factory;
         }
 
+        @Override
         public final Reader<ElementReader> constructReader(SegmentReader segment,
                                                              int ptr,
                                                              int elementCount, int step,
@@ -40,6 +41,7 @@ public final class ListList {
             return new Reader<ElementReader>(factory, segment, ptr, elementCount, step, structDataSize, structPointerCount, nestingLimit);
         }
 
+        @Override
         public final Builder<ElementBuilder> constructBuilder(SegmentBuilder segment,
                                                               int ptr,
                                                               int elementCount, int step,
diff --git a/runtime/src/main/java/org/capnproto/PrimitiveList.java b/runtime/src/main/java/org/capnproto/PrimitiveList.java
index 1627664..6317698 100644
--- a/runtime/src/main/java/org/capnproto/PrimitiveList.java
+++ b/runtime/src/main/java/org/capnproto/PrimitiveList.java
@@ -26,6 +26,7 @@ public class PrimitiveList {
         public static final class Factory extends ListFactory<Builder, Reader> {
             Factory() {super (ElementSize.VOID); }
 
+            @Override
             public final Reader constructReader(SegmentReader segment,
                                                   int ptr,
                                                   int elementCount, int step,
@@ -34,6 +35,7 @@ public class PrimitiveList {
                 return new Reader(segment, ptr, elementCount, step, structDataSize, structPointerCount, nestingLimit);
             }
 
+            @Override
             public final Builder constructBuilder(SegmentBuilder segment,
                                                     int ptr,
                                                     int elementCount, int step,
@@ -77,6 +79,8 @@ public class PrimitiveList {
     public static class Boolean {
         public static final class Factory extends ListFactory<Builder, Reader> {
             Factory() {super (ElementSize.BIT); }
+
+            @Override
             public final Reader constructReader(SegmentReader segment,
                                                   int ptr,
                                                   int elementCount, int step,
@@ -85,6 +89,7 @@ public class PrimitiveList {
                 return new Reader(segment, ptr, elementCount, step, structDataSize, structPointerCount, nestingLimit);
             }
 
+            @Override
             public final Builder constructBuilder(SegmentBuilder segment,
                                                     int ptr,
                                                     int elementCount, int step,
@@ -134,6 +139,8 @@ public class PrimitiveList {
     public static class Byte {
         public static final class Factory extends ListFactory<Builder, Reader> {
             Factory() {super (ElementSize.BYTE); }
+
+            @Override
             public final Reader constructReader(SegmentReader segment,
                                                   int ptr,
                                                   int elementCount, int step,
@@ -142,6 +149,7 @@ public class PrimitiveList {
                 return new Reader(segment, ptr, elementCount, step, structDataSize, structPointerCount, nestingLimit);
             }
 
+            @Override
             public final Builder constructBuilder(SegmentBuilder segment,
                                                     int ptr,
                                                     int elementCount, int step,
@@ -191,6 +199,8 @@ public class PrimitiveList {
     public static class Short {
         public static final class Factory extends ListFactory<Builder, Reader> {
             Factory() {super (ElementSize.TWO_BYTES); }
+
+            @Override
             public final Reader constructReader(SegmentReader segment,
                                                   int ptr,
                                                   int elementCount, int step,
@@ -199,6 +209,7 @@ public class PrimitiveList {
                 return new Reader(segment, ptr, elementCount, step, structDataSize, structPointerCount, nestingLimit);
             }
 
+            @Override
             public final Builder constructBuilder(SegmentBuilder segment,
                                                     int ptr,
                                                     int elementCount, int step,
@@ -249,6 +260,8 @@ public class PrimitiveList {
     public static class Int {
         public static final class Factory extends ListFactory<Builder, Reader> {
             Factory() {super (ElementSize.FOUR_BYTES); }
+
+            @Override
             public final Reader constructReader(SegmentReader segment,
                                                   int ptr,
                                                   int elementCount, int step,
@@ -257,6 +270,7 @@ public class PrimitiveList {
                 return new Reader(segment, ptr, elementCount, step, structDataSize, structPointerCount, nestingLimit);
             }
 
+            @Override
             public final Builder constructBuilder(SegmentBuilder segment,
                                                     int ptr,
                                                     int elementCount, int step,
@@ -307,6 +321,8 @@ public class PrimitiveList {
     public static class Float {
         public static final class Factory extends ListFactory<Builder, Reader> {
             Factory() {super (ElementSize.FOUR_BYTES); }
+
+            @Override
             public final Reader constructReader(SegmentReader segment,
                                                   int ptr,
                                                   int elementCount, int step,
@@ -315,6 +331,7 @@ public class PrimitiveList {
                 return new Reader(segment, ptr, elementCount, step, structDataSize, structPointerCount, nestingLimit);
             }
 
+            @Override
             public final Builder constructBuilder(SegmentBuilder segment,
                                                     int ptr,
                                                     int elementCount, int step,
@@ -365,6 +382,8 @@ public class PrimitiveList {
     public static class Long {
         public static final class Factory extends ListFactory<Builder, Reader> {
             Factory() {super (ElementSize.EIGHT_BYTES); }
+
+            @Override
             public final Reader constructReader(SegmentReader segment,
                                                   int ptr,
                                                   int elementCount, int step,
@@ -373,6 +392,7 @@ public class PrimitiveList {
                 return new Reader(segment, ptr, elementCount, step, structDataSize, structPointerCount, nestingLimit);
             }
 
+            @Override
             public final Builder constructBuilder(SegmentBuilder segment,
                                                     int ptr,
                                                     int elementCount, int step,
@@ -422,6 +442,8 @@ public class PrimitiveList {
     public static class Double {
         public static final class Factory extends ListFactory<Builder, Reader> {
             Factory() {super (ElementSize.EIGHT_BYTES); }
+
+            @Override
             public final Reader constructReader(SegmentReader segment,
                                                   int ptr,
                                                   int elementCount, int step,
@@ -430,6 +452,7 @@ public class PrimitiveList {
                 return new Reader(segment, ptr, elementCount, step, structDataSize, structPointerCount, nestingLimit);
             }
 
+            @Override
             public final Builder constructBuilder(SegmentBuilder segment,
                                                     int ptr,
                                                     int elementCount, int step,
diff --git a/runtime/src/main/java/org/capnproto/ReaderArena.java b/runtime/src/main/java/org/capnproto/ReaderArena.java
index 3d7fd98..13c9c87 100644
--- a/runtime/src/main/java/org/capnproto/ReaderArena.java
+++ b/runtime/src/main/java/org/capnproto/ReaderArena.java
@@ -39,10 +39,12 @@ public final class ReaderArena implements Arena {
         }
     }
 
+    @Override
     public SegmentReader tryGetSegment(int id) {
         return segments.get(id);
     }
 
+    @Override
     public final void checkReadLimit(int numBytes) {
         if (numBytes > limit) {
             throw new DecodeException("Read limit exceeded.");
diff --git a/runtime/src/main/java/org/capnproto/StructList.java b/runtime/src/main/java/org/capnproto/StructList.java
index 101c77f..32c1bc1 100644
--- a/runtime/src/main/java/org/capnproto/StructList.java
+++ b/runtime/src/main/java/org/capnproto/StructList.java
@@ -32,6 +32,7 @@ public final class StructList {
             this.factory = factory;
         }
 
+        @Override
         public final Reader<ElementReader> constructReader(SegmentReader segment,
                                                            int ptr,
                                                            int elementCount, int step,
@@ -41,6 +42,7 @@ public final class StructList {
                                              segment, ptr, elementCount, step, structDataSize, structPointerCount, nestingLimit);
         }
 
+        @Override
         public final Builder<ElementBuilder> constructBuilder(SegmentBuilder segment,
                                                               int ptr,
                                                               int elementCount, int step,
@@ -48,6 +50,7 @@ public final class StructList {
             return new Builder<ElementBuilder> (factory, segment, ptr, elementCount, step, structDataSize, structPointerCount);
         }
 
+        @Override
         public final Builder<ElementBuilder> fromPointerBuilderRefDefault(SegmentBuilder segment, int pointer,
                                                                           SegmentReader defaultSegment, int defaultOffset) {
             return WireHelpers.getWritableStructListPointer(this,
diff --git a/runtime/src/main/java/org/capnproto/Text.java b/runtime/src/main/java/org/capnproto/Text.java
index 679cdb6..6900d41 100644
--- a/runtime/src/main/java/org/capnproto/Text.java
+++ b/runtime/src/main/java/org/capnproto/Text.java
@@ -29,15 +29,18 @@ public final class Text {
                                       FromPointerBuilderBlobDefault<Builder>,
                                       PointerFactory<Builder, Reader>,
                                       SetPointerBuilder<Builder, Reader> {
+        @Override
         public final Reader fromPointerReaderBlobDefault(SegmentReader segment, int pointer, java.nio.ByteBuffer defaultBuffer,
                                                    int defaultOffset, int defaultSize) {
             return WireHelpers.readTextPointer(segment, pointer, defaultBuffer, defaultOffset, defaultSize);
         }
 
+        @Override
         public final Reader fromPointerReader(SegmentReader segment, int pointer, int nestingLimit) {
             return WireHelpers.readTextPointer(segment, pointer, null, 0, 0);
         }
 
+        @Override
         public final Builder fromPointerBuilderBlobDefault(SegmentBuilder segment, int pointer,
                                                      java.nio.ByteBuffer defaultBuffer, int defaultOffset, int defaultSize) {
             return WireHelpers.getWritableTextPointer(pointer,
@@ -47,16 +50,19 @@ public final class Text {
                                                       defaultSize);
         }
 
+        @Override
         public final Builder fromPointerBuilder(SegmentBuilder segment, int pointer) {
             return WireHelpers.getWritableTextPointer(pointer,
                                                       segment,
                                                       null, 0, 0);
         }
 
+        @Override
         public final Builder initFromPointerBuilder(SegmentBuilder segment, int pointer, int size) {
             return WireHelpers.initTextPointer(pointer, segment, size);
         }
 
+        @Override
         public final void setPointerBuilder(SegmentBuilder segment, int pointer, Reader value) {
             WireHelpers.setTextPointer(pointer, segment, value);
         }