diff --git a/src/com/sheepit/client/Server.java b/src/com/sheepit/client/Server.java
index 1c6a2a4..469087b 100644
--- a/src/com/sheepit/client/Server.java
+++ b/src/com/sheepit/client/Server.java
@@ -330,7 +330,7 @@ public class Server extends Thread {
 					.addQueryParameter("gpu_type", user_config.getGPUDevice().getType());
 			}
 			
-			Response response = this.HTTPRequest(urlBuilder, RequestBody.create(MediaType.parse("application/xml"), this.generateXMLForMD5cache()));
+			Response response = this.HTTPRequest(urlBuilder, RequestBody.create(this.generateXMLForMD5cache(), MediaType.parse("application/xml")));
 			
 			int r = response.code();
 			String contentType = response.body().contentType().toString();
diff --git a/src/com/sheepit/client/os/Windows.java b/src/com/sheepit/client/os/Windows.java
index 79c1546..fe64f0e 100644
--- a/src/com/sheepit/client/os/Windows.java
+++ b/src/com/sheepit/client/os/Windows.java
@@ -79,7 +79,7 @@ public class Windows extends OS {
 	@Override public boolean isSupported() {
 		long buildNumber = Long.MIN_VALUE;
 		try {
-			buildNumber = Long.valueOf(operatingSystem.getVersionInfo().getBuildNumber());
+			buildNumber = Long.parseLong(operatingSystem.getVersionInfo().getBuildNumber());
 		}
 		catch(NumberFormatException e) {
 			System.err.println("Windows::isSupported Failed to extract Windows build number: " + e);
diff --git a/src/com/sheepit/client/standalone/swing/activity/Settings.java b/src/com/sheepit/client/standalone/swing/activity/Settings.java
index 9afcf08..adc8d5f 100644
--- a/src/com/sheepit/client/standalone/swing/activity/Settings.java
+++ b/src/com/sheepit/client/standalone/swing/activity/Settings.java
@@ -417,7 +417,7 @@ public class Settings implements Activity {
 		}
 		Hashtable<Integer, JLabel> labelTable = new Hashtable<Integer, JLabel>();
 		for (int g = 0; g < all_ram; g += step) {
-			labelTable.put(new Integer(g), new JLabel("" + (g / 1000000)));
+			labelTable.put(g, new JLabel("" + (g / 1000000)));
 		}
 		ram.setMajorTickSpacing(step);
 		ram.setLabelTable(labelTable);