diff --git a/common/common-io/src/main/java/com/twelvemonkeys/io/CompoundReader.java b/common/common-io/src/main/java/com/twelvemonkeys/io/CompoundReader.java
index 47279114..93b40642 100755
--- a/common/common-io/src/main/java/com/twelvemonkeys/io/CompoundReader.java
+++ b/common/common-io/src/main/java/com/twelvemonkeys/io/CompoundReader.java
@@ -56,8 +56,8 @@ public class CompoundReader extends Reader {
 
     private int currentReader;
     private int markedReader;
-    private int mark;
-    private int mNext;
+    private long mark;
+    private long next;
 
     /**
      * Create a new compound reader.
@@ -76,7 +76,7 @@ public class CompoundReader extends Reader {
         finalLock = pReaders; // NOTE: It's ok to sync on pReaders, as the
                           // reference can't change, only it's elements
 
-        readers = new ArrayList<Reader>();
+        readers = new ArrayList<>();
 
         boolean markSupported = true;
         while (pReaders.hasNext()) {
@@ -101,7 +101,7 @@ public class CompoundReader extends Reader {
         }
         
         // NOTE: Reset mNext for every reader, and record marked reader in mark/reset methods!
-        mNext = 0;
+        next = 0;
         return current;
     }
 
@@ -135,7 +135,7 @@ public class CompoundReader extends Reader {
 
         synchronized (finalLock) {
             ensureOpen();
-            mark = mNext;
+            mark = next;
             markedReader = currentReader;
 
             current.mark(pReadLimit);
@@ -158,7 +158,7 @@ public class CompoundReader extends Reader {
             }
             current.reset();
 
-            mNext = mark;
+            next = mark;
         }
     }
 
@@ -177,13 +177,13 @@ public class CompoundReader extends Reader {
                 return read(); // In case of 0-length readers
             }
 
-            mNext++;
+            next++;
 
             return read;
         }
     }
 
-    public int read(char pBuffer[], int pOffset, int pLength) throws IOException {
+    public int read(char[] pBuffer, int pOffset, int pLength) throws IOException {
         synchronized (finalLock) {
             int read = current.read(pBuffer, pOffset, pLength);
 
@@ -192,7 +192,7 @@ public class CompoundReader extends Reader {
                 return read(pBuffer, pOffset, pLength); // In case of 0-length readers
             }
 
-            mNext += read;
+            next += read;
 
             return read;
         }
@@ -213,7 +213,7 @@ public class CompoundReader extends Reader {
                 return skip(pChars); // In case of 0-length readers
             }
 
-            mNext += skipped;
+            next += skipped;
 
             return skipped;
         }
diff --git a/common/common-io/src/main/java/com/twelvemonkeys/io/StringArrayReader.java b/common/common-io/src/main/java/com/twelvemonkeys/io/StringArrayReader.java
index 45ec3f9b..7523f872 100755
--- a/common/common-io/src/main/java/com/twelvemonkeys/io/StringArrayReader.java
+++ b/common/common-io/src/main/java/com/twelvemonkeys/io/StringArrayReader.java
@@ -50,8 +50,8 @@ public class StringArrayReader extends StringReader {
     protected final Object finalLock;
     private int currentSting;
     private int markedString;
-    private int mark;
-    private int next;
+    private long mark;
+    private long next;
 
     /**
      * Create a new string array reader.
@@ -151,7 +151,7 @@ public class StringArrayReader extends StringReader {
         }
     }
 
-    public int read(char pBuffer[], int pOffset, int pLength) throws IOException {
+    public int read(char[] pBuffer, int pOffset, int pLength) throws IOException {
         synchronized (finalLock) {
             int read = current.read(pBuffer, pOffset, pLength);
 
diff --git a/imageio/imageio-webp/src/main/java/com/twelvemonkeys/imageio/plugins/webp/lossless/PredictorTransform.java b/imageio/imageio-webp/src/main/java/com/twelvemonkeys/imageio/plugins/webp/lossless/PredictorTransform.java
index 042042a2..92e282c7 100644
--- a/imageio/imageio-webp/src/main/java/com/twelvemonkeys/imageio/plugins/webp/lossless/PredictorTransform.java
+++ b/imageio/imageio-webp/src/main/java/com/twelvemonkeys/imageio/plugins/webp/lossless/PredictorTransform.java
@@ -60,7 +60,7 @@ final class PredictorTransform implements Transform {
 
         // (0,0) Black (0x000000ff) predict
         raster.getDataElements(0, 0, rgba);
-        rgba[3] += 0xff;
+        rgba[3] += (byte) 0xff;
         raster.setDataElements(0, 0, rgba);
 
         byte[] predictor = new byte[4];
@@ -100,7 +100,7 @@ final class PredictorTransform implements Transform {
 
                 switch (transformType) {
                     case PredictorMode.BLACK:
-                        rgba[3] += 0xff;
+                        rgba[3] += (byte) 0xff;
                         break;
                     case PredictorMode.L:
                         raster.getDataElements(lX, y, predictor);