diff --git a/protobuf-api/src/main/java/com/google/protobuf/FlattenedGeneratedMessageV3.java b/protobuf-api/src/main/java/com/google/protobuf/FlattenedGeneratedMessageV3.java
index 6b1933a..eac44f5 100644
--- a/protobuf-api/src/main/java/com/google/protobuf/FlattenedGeneratedMessageV3.java
+++ b/protobuf-api/src/main/java/com/google/protobuf/FlattenedGeneratedMessageV3.java
@@ -47,7 +47,7 @@
  *
  * @author kenton@google.com Kenton Varda
  */
-abstract class FlattenedGeneratedMessageV3 implements Message, Serializable {
+abstract class FlattenedGeneratedMessageV3 extends AbstractMessage implements Serializable {
   private static final long serialVersionUID = 1L;
 
   /**
diff --git a/protobuf-sdk/pom.xml b/protobuf-sdk/pom.xml
index e87e759..24653a3 100644
--- a/protobuf-sdk/pom.xml
+++ b/protobuf-sdk/pom.xml
@@ -17,6 +17,15 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
+    <build>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <targetPath>google/protobuf</targetPath>
+            </resource>
+        </resources>
+    </build>
+
     <dependencies>
         <dependency>
             <groupId>org.example</groupId>