diff --git a/core/src/main/java/com/threerings/getdown/data/Application.java b/core/src/main/java/com/threerings/getdown/data/Application.java
index bc7cc42..2cfef49 100644
--- a/core/src/main/java/com/threerings/getdown/data/Application.java
+++ b/core/src/main/java/com/threerings/getdown/data/Application.java
@@ -1332,7 +1332,7 @@ public class Application
         // is reported by posting runnable actions to the actions queue which is processed by the
         // main (UI) thread
         ExecutorService exec = Executors.newFixedThreadPool(SysProps.threadPoolSize());
-        final BlockingQueue<Runnable> actions = new LinkedBlockingQueue<Runnable>();
+        final BlockingQueue<Runnable> actions = new LinkedBlockingQueue<>();
         final int[] completed = new int[1];
 
         long start = System.currentTimeMillis();
diff --git a/core/src/main/java/com/threerings/getdown/data/PathBuilder.java b/core/src/main/java/com/threerings/getdown/data/PathBuilder.java
index 1f10d0d..ef87c78 100644
--- a/core/src/main/java/com/threerings/getdown/data/PathBuilder.java
+++ b/core/src/main/java/com/threerings/getdown/data/PathBuilder.java
@@ -40,7 +40,7 @@ public class PathBuilder
      */
     public static ClassPath buildDefaultClassPath (Application app)
     {
-        LinkedHashSet<File> classPathEntries = new LinkedHashSet<File>();
+        LinkedHashSet<File> classPathEntries = new LinkedHashSet<>();
         for (Resource resource : app.getActiveCodeResources()) {
             classPathEntries.add(resource.getFinalTarget());
         }
diff --git a/core/src/test/java/com/threerings/getdown/data/ClassPathTest.java b/core/src/test/java/com/threerings/getdown/data/ClassPathTest.java
index 7091976..f9b27ee 100644
--- a/core/src/test/java/com/threerings/getdown/data/ClassPathTest.java
+++ b/core/src/test/java/com/threerings/getdown/data/ClassPathTest.java
@@ -27,7 +27,7 @@ public class ClassPathTest
         _firstJar = _folder.newFile("a.jar");
         _secondJar = _folder.newFile("b.jar");
 
-        LinkedHashSet<File> classPathEntries = new LinkedHashSet<File>();
+        LinkedHashSet<File> classPathEntries = new LinkedHashSet<>();
         classPathEntries.add(_firstJar);
         classPathEntries.add(_secondJar);
         _classPath = new ClassPath(classPathEntries);
diff --git a/launcher/src/main/java/com/threerings/getdown/launcher/ProxyUtil.java b/launcher/src/main/java/com/threerings/getdown/launcher/ProxyUtil.java
index 6f9a11f..7d7c1f5 100644
--- a/launcher/src/main/java/com/threerings/getdown/launcher/ProxyUtil.java
+++ b/launcher/src/main/java/com/threerings/getdown/launcher/ProxyUtil.java
@@ -218,7 +218,7 @@ public final class ProxyUtil {
             log.info("Using no proxy");
             app.conn = new Connector();
         } else {
-            int pp = StringUtil.isBlank(port) ? 80 : Integer.valueOf(port);
+            int pp = StringUtil.isBlank(port) ? 80 : Integer.parseInt(port);
             log.info("Using proxy", "host", host, "port", pp, "haveCreds", haveCreds);
             app.conn = new Connector(new Proxy(Proxy.Type.HTTP, new InetSocketAddress(host, pp)));
         }