diff --git a/src/se/vidstige/jadb/JadbDevice.java b/src/se/vidstige/jadb/JadbDevice.java
index ab75a20..5562870 100644
--- a/src/se/vidstige/jadb/JadbDevice.java
+++ b/src/se/vidstige/jadb/JadbDevice.java
@@ -5,8 +5,8 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class JadbDevice {
-	private String serial;
-	private Transport transport;
+	private final String serial;
+	private final Transport transport;
 	private boolean selected = false;
 
 	JadbDevice(String serial, String type, Transport transport) {
diff --git a/src/se/vidstige/jadb/server/AdbProtocolHandler.java b/src/se/vidstige/jadb/server/AdbProtocolHandler.java
index cf89344..f0b01f3 100644
--- a/src/se/vidstige/jadb/server/AdbProtocolHandler.java
+++ b/src/se/vidstige/jadb/server/AdbProtocolHandler.java
@@ -9,7 +9,7 @@ import java.net.ProtocolException;
 import java.net.Socket;
 import java.nio.charset.Charset;
 
-public class AdbProtocolHandler implements Runnable {
+class AdbProtocolHandler implements Runnable {
 	private final Socket socket;
     private final AdbResponder responder;
     private AdbDeviceResponder selected;
diff --git a/src/se/vidstige/jadb/server/AdbServer.java b/src/se/vidstige/jadb/server/AdbServer.java
index 8f336fc..9d3caf2 100644
--- a/src/se/vidstige/jadb/server/AdbServer.java
+++ b/src/se/vidstige/jadb/server/AdbServer.java
@@ -8,7 +8,7 @@ import java.net.Socket;
 public class AdbServer extends SocketServer {
 
     public static final int DEFAULT_PORT = 15037;
-    private AdbResponder responder;
+    private final AdbResponder responder;
 
     public AdbServer(AdbResponder responder)
     {
diff --git a/src/se/vidstige/jadb/server/SocketServer.java b/src/se/vidstige/jadb/server/SocketServer.java
index 28a9b20..aac6af4 100644
--- a/src/se/vidstige/jadb/server/SocketServer.java
+++ b/src/se/vidstige/jadb/server/SocketServer.java
@@ -12,7 +12,7 @@ public abstract class SocketServer implements Runnable {
 	private Thread thread;
 	private final Object lockObject = new Object();
 
-    public SocketServer(int port)
+    protected SocketServer(int port)
     {
         this.port = port;
     }
diff --git a/test/se/vidstige/jadb/test/fakes/FakeAdbServer.java b/test/se/vidstige/jadb/test/fakes/FakeAdbServer.java
index b7b0857..994966e 100644
--- a/test/se/vidstige/jadb/test/fakes/FakeAdbServer.java
+++ b/test/se/vidstige/jadb/test/fakes/FakeAdbServer.java
@@ -156,7 +156,7 @@ public class FakeAdbServer implements AdbResponder {
                 this.content = content.getBytes(Charset.forName("utf-8"));
             }
 
-            public boolean matches(RemoteFile path) throws JadbException {
+            public boolean matches(RemoteFile path) {
                 return this.path.equals(path);
             }