diff --git a/imageio/imageio-pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/PICTImageReaderSpi.java b/imageio/imageio-pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/PICTImageReaderSpi.java
index e6323d46..1e8b7736 100755
--- a/imageio/imageio-pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/PICTImageReaderSpi.java
+++ b/imageio/imageio-pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/PICTImageReaderSpi.java
@@ -43,11 +43,12 @@ import java.util.Locale;
  * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
  * @version $Id: PICTImageReaderSpi.java,v 1.0 28.feb.2006 19:21:05 haku Exp$
  */
-public class PICTImageReaderSpi extends ImageReaderSpiBase {
+public final class PICTImageReaderSpi extends ImageReaderSpiBase {
 
     /**
      * Creates a {@code PICTImageReaderSpi}.
      */
+    @SuppressWarnings("WeakerAccess")
     public PICTImageReaderSpi() {
         super(new PICTProviderInfo());
     }
@@ -83,11 +84,12 @@ public class PICTImageReaderSpi extends ImageReaderSpiBase {
 
     static void skipNullHeader(final ImageInputStream pStream) throws IOException {
         // NOTE: Only skip if FILE FORMAT, not needed for Mac OS DnD
-        // Spec says "platofrm dependent", may not be all nulls..
+        // Spec says "platform dependent", may not be all nulls..
         pStream.skipBytes(PICT.PICT_NULL_HEADER_SIZE);
     }
 
     private boolean isPICT(final ImageInputStream pStream) throws IOException {
+        // TODO: Need to validate better...
         // Size may be 0, so we can't use this for validation...
         pStream.readUnsignedShort();
 
diff --git a/imageio/imageio-pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/PICTImageWriter.java b/imageio/imageio-pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/PICTImageWriter.java
index df8734b6..09b0747d 100755
--- a/imageio/imageio-pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/PICTImageWriter.java
+++ b/imageio/imageio-pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/PICTImageWriter.java
@@ -83,7 +83,7 @@ import java.io.*;
  * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
  * @version $Id: PICTWriter.java,v 1.0 05.apr.2006 15:20:48 haku Exp$
  */
-public class PICTImageWriter extends ImageWriterBase {
+public final class PICTImageWriter extends ImageWriterBase {
 
     // TODO: Inline these?
     private int rowBytes;
diff --git a/imageio/imageio-pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/PICTImageWriterSpi.java b/imageio/imageio-pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/PICTImageWriterSpi.java
index 86507cdb..a5354889 100755
--- a/imageio/imageio-pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/PICTImageWriterSpi.java
+++ b/imageio/imageio-pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/PICTImageWriterSpi.java
@@ -42,7 +42,7 @@ import java.util.Locale;
  * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
  * @version $Id: PICTImageWriterSpi.java,v 1.0 02.mar.2006 19:21:05 haku Exp$
  */
-public class PICTImageWriterSpi extends ImageWriterSpiBase {
+public final class PICTImageWriterSpi extends ImageWriterSpiBase {
 
     /**
      * Creates a {@code PICTImageWriterSpi}.