diff --git a/common/buildcraft/core/network/RPCHandler.java b/common/buildcraft/core/network/RPCHandler.java
index e158cbd1..a25a9b3e 100755
--- a/common/buildcraft/core/network/RPCHandler.java
+++ b/common/buildcraft/core/network/RPCHandler.java
@@ -40,12 +40,12 @@ import buildcraft.transport.Pipe;
  */
 public final class RPCHandler {
 
-	Class handledClass;
-
 	public static int MAX_PACKET_SIZE = 30 * 1024;
 
 	private static Map<String, RPCHandler> handlers = new TreeMap<String, RPCHandler>();
 
+	private Class handledClass;
+
 	private Map<String, Integer> methodsMap = new TreeMap<String, Integer>();
 
 	class MethodMapping {
diff --git a/guidelines/buildcraft.checkstyle b/guidelines/buildcraft.checkstyle
index dd2a1bc8..b63553ad 100755
--- a/guidelines/buildcraft.checkstyle
+++ b/guidelines/buildcraft.checkstyle
@@ -24,7 +24,7 @@
       <property name="format" value="^[a-z][a-zA-Z0-9_]*$"/>
     </module>
     <module name="ImportOrder">
-      <property name="groups" value="java,com,org,io,net.minecraft,cpw,net.minecraftforge,buildcraft"/>
+      <property name="groups" value="java,com,org,io,joptsimple,net.minecraft,cpw,net.minecraftforge,buildcraft"/>
     </module>
     <module name="WhitespaceAround">
       <property name="tokens" value="ASSIGN,BAND,BAND_ASSIGN,BOR,BOR_ASSIGN,BSR,BSR_ASSIGN,BXOR,BXOR_ASSIGN,COLON,DIV,DIV_ASSIGN,EQUAL,GE,GT,LAND,LE,LITERAL_ASSERT,LITERAL_CATCH,LITERAL_DO,LITERAL_ELSE,LITERAL_FINALLY,LITERAL_FOR,LITERAL_IF,LITERAL_RETURN,LITERAL_SYNCHRONIZED,LITERAL_TRY,LITERAL_WHILE,LOR,LT,MINUS,MINUS_ASSIGN,MOD,MOD_ASSIGN,NOT_EQUAL,PLUS,PLUS_ASSIGN,QUESTION,SL,SLIST,SL_ASSIGN,SR,SR_ASSIGN,STAR,STAR_ASSIGN,LITERAL_ASSERT,TYPE_EXTENSION_AND,WILDCARD_TYPE"/>
diff --git a/tests/buildcraft/tests/BuildCraftTests.java b/tests/buildcraft/tests/BuildCraftTests.java
index 560a2d5a..1408cd8c 100755
--- a/tests/buildcraft/tests/BuildCraftTests.java
+++ b/tests/buildcraft/tests/BuildCraftTests.java
@@ -43,10 +43,6 @@ import buildcraft.tests.testcase.TileTestCase;
 @Mod(name = "BuildCraft Tests", version = Version.VERSION, useMetadata = false, modid = "BuildCraft|Tests", dependencies = DefaultProps.DEPENDENCY_CORE)
 public class BuildCraftTests extends BuildCraftMod {
 
-	private long startTestTime = 0;
-	private String testFile = "";
-	private Sequence testSequence;
-
 	public static Block blockTestPathfinding;
 	public static Block blockTestCase;
 
@@ -55,6 +51,10 @@ public class BuildCraftTests extends BuildCraftMod {
 	@Mod.Instance("BuildCraft|Tests")
 	public static BuildCraftTests instance;
 
+	private long startTestTime = 0;
+	private String testFile = "";
+	private Sequence testSequence;
+
 	@Mod.EventHandler
 	public void preInit(FMLPreInitializationEvent evt) {
 		blockTestPathfinding = new BlockTestPathfinding();
diff --git a/tests/buildcraft/tests/GuiTestIds.java b/tests/buildcraft/tests/GuiTestIds.java
index 4d0d0083..3ab849a6 100755
--- a/tests/buildcraft/tests/GuiTestIds.java
+++ b/tests/buildcraft/tests/GuiTestIds.java
@@ -1,8 +1,11 @@
 package buildcraft.tests;
 
-public class GuiTestIds {
+public final class GuiTestIds {
 
 	public static final int TESTER_ID = 0;
 	public static final int TESTCASE_ID = 1;
 
+	private GuiTestIds() {
+		// Deactivate constructor
+	}
 }
diff --git a/tests/buildcraft/tests/testcase/GuiTestCase.java b/tests/buildcraft/tests/testcase/GuiTestCase.java
index a357838e..54a4ed1d 100755
--- a/tests/buildcraft/tests/testcase/GuiTestCase.java
+++ b/tests/buildcraft/tests/testcase/GuiTestCase.java
@@ -33,8 +33,7 @@ public class GuiTestCase extends GuiContainer {
 			"buildcraft", DefaultProps.TEXTURE_PATH_GUI + "/tester.png");
 
 	private GuiTextField textField;
-
-	TileTestCase testCase;
+	private TileTestCase testCase;
 
 	public GuiTestCase(EntityPlayer player, int x, int y, int z) {
 		super(new ContainerTestCase(player, x, y, z));