diff --git a/briar-android/src/net/sf/briar/android/invitation/CodeEntryWidget.java b/briar-android/src/net/sf/briar/android/invitation/CodeEntryWidget.java
index 68f73f298274b927e0e75db10409d7443affa3da..657cb5c3d9462bd480147e7f2ed47113edbfaa17 100644
--- a/briar-android/src/net/sf/briar/android/invitation/CodeEntryWidget.java
+++ b/briar-android/src/net/sf/briar/android/invitation/CodeEntryWidget.java
@@ -84,7 +84,7 @@ implements OnEditorActionListener, OnClickListener {
 		String remoteCodeString = codeEntry.getText().toString();
 		int remoteCode;
 		try {
-			remoteCode = Integer.valueOf(remoteCodeString);
+			remoteCode = Integer.parseInt(remoteCodeString);
 		} catch(NumberFormatException e) {
 			return false;
 		}
diff --git a/briar-core/src/net/sf/briar/plugins/tcp/LanTcpPlugin.java b/briar-core/src/net/sf/briar/plugins/tcp/LanTcpPlugin.java
index e67697d5d47e92f59b4316323ec90f42a8622dfd..aeb307c6f49fd902d0f1489ed754caef615caba6 100644
--- a/briar-core/src/net/sf/briar/plugins/tcp/LanTcpPlugin.java
+++ b/briar-core/src/net/sf/briar/plugins/tcp/LanTcpPlugin.java
@@ -73,7 +73,7 @@ class LanTcpPlugin extends TcpPlugin {
 				!StringUtils.isNullOrEmpty(portString)) {
 			try {
 				addr = InetAddress.getByName(addrString);
-				int port = Integer.valueOf(portString);
+				int port = Integer.parseInt(portString);
 				addrs.add(new InetSocketAddress(addr, port));
 				addrs.add(new InetSocketAddress(addr, 0));
 			} catch(NumberFormatException e) {
diff --git a/briar-core/src/net/sf/briar/plugins/tcp/TcpPlugin.java b/briar-core/src/net/sf/briar/plugins/tcp/TcpPlugin.java
index 230bbd4e1ca235f914fc528033cf1ee2c925243d..5f8fb8195f7195ad78e023c0f0b1cf7ef0b11d51 100644
--- a/briar-core/src/net/sf/briar/plugins/tcp/TcpPlugin.java
+++ b/briar-core/src/net/sf/briar/plugins/tcp/TcpPlugin.java
@@ -191,7 +191,7 @@ abstract class TcpPlugin implements DuplexPlugin {
 		if(StringUtils.isNullOrEmpty(portString)) return null;
 		try {
 			InetAddress addr = InetAddress.getByName(addrString);
-			int port = Integer.valueOf(portString);
+			int port = Integer.parseInt(portString);
 			return new InetSocketAddress(addr, port);
 		} catch(NumberFormatException e) {
 			if(LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
diff --git a/briar-core/src/net/sf/briar/plugins/tcp/WanTcpPlugin.java b/briar-core/src/net/sf/briar/plugins/tcp/WanTcpPlugin.java
index 008e118555d787fc0dfe5047fdae42737a7e5166..962d52ccc52b6c44310327a5663d75c0b0267623 100644
--- a/briar-core/src/net/sf/briar/plugins/tcp/WanTcpPlugin.java
+++ b/briar-core/src/net/sf/briar/plugins/tcp/WanTcpPlugin.java
@@ -64,7 +64,7 @@ class WanTcpPlugin extends TcpPlugin {
 				!StringUtils.isNullOrEmpty(portString)) {
 			try {
 				addr = InetAddress.getByName(addrString);
-				port = Integer.valueOf(portString);
+				port = Integer.parseInt(portString);
 				addrs.add(new InetSocketAddress(addr, port));
 				addrs.add(new InetSocketAddress(addr, 0));
 			} catch(NumberFormatException e) {
diff --git a/briar-tests/src/net/sf/briar/plugins/tcp/LanTcpPluginTest.java b/briar-tests/src/net/sf/briar/plugins/tcp/LanTcpPluginTest.java
index 80d6eec797ac2be080c16585ad9ef3f97bd4bc3f..61d563c34dcbbf4fd196f1d63591c72f92e0f42c 100644
--- a/briar-tests/src/net/sf/briar/plugins/tcp/LanTcpPluginTest.java
+++ b/briar-tests/src/net/sf/briar/plugins/tcp/LanTcpPluginTest.java
@@ -45,7 +45,7 @@ public class LanTcpPluginTest extends BriarTestCase {
 		assertEquals("127.0.0.1", host);
 		String portString = callback.local.get("port");
 		assertNotNull(portString);
-		int port = Integer.valueOf(portString);
+		int port = Integer.parseInt(portString);
 		assertTrue(port > 0 && port < 65536);
 		// The plugin should be listening on the port
 		InetSocketAddress addr = new InetSocketAddress(host, port);