diff --git a/apps/routerconsole/java/src/net/i2p/router/update/TrustedPluginKeys.java b/apps/routerconsole/java/src/net/i2p/router/update/TrustedPluginKeys.java
index 798782fb2..8f128496d 100644
--- a/apps/routerconsole/java/src/net/i2p/router/update/TrustedPluginKeys.java
+++ b/apps/routerconsole/java/src/net/i2p/router/update/TrustedPluginKeys.java
@@ -43,7 +43,7 @@ class TrustedPluginKeys {
      *  @return map of B64 DSA keys to signer names
      */
     public static Map<String, String> getKeys() {
-        Map<String, String> rv = new HashMap(KEYS.length / 2);
+        Map<String, String> rv = new HashMap<String, String>(KEYS.length / 2);
         for (int i = 0; i < KEYS.length; i += 2) {
             rv.put(KEYS[i+1], KEYS[i]);
         }
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/CSSHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/CSSHelper.java
index a13a432f2..e5a548cf1 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/CSSHelper.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/CSSHelper.java
@@ -59,7 +59,7 @@ public class CSSHelper extends HelperBase {
         // Protected with nonce in css.jsi
         if (lang != null && lang.length() >= 2 && lang.length() <= 6 &&
             lang.replaceAll("[a-zA-Z_]", "").length() == 0) {
-            Map m = new HashMap(2);
+            Map<String, String> m = new HashMap<String, String>(2);
             int under = lang.indexOf('_');
             if (under < 0) {
                 m.put(Messages.PROP_LANG, lang.toLowerCase(Locale.US));
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigTunnelsHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigTunnelsHandler.java
index 5e34d7245..ad444c9a6 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigTunnelsHandler.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigTunnelsHandler.java
@@ -38,7 +38,7 @@ public class ConfigTunnelsHandler extends FormHandler {
      */
     private void saveChanges() {
         boolean saveRequired = false;
-        Map<String, String> changes = new HashMap();
+        Map<String, String> changes = new HashMap<String, String>();
         
         if (_log.shouldLog(Log.DEBUG))
             _log.debug("Saving changes, with props = " + _settings + ".");
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/WebAppStarter.java b/apps/routerconsole/java/src/net/i2p/router/web/WebAppStarter.java
index 49aca0898..18250d3a2 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/WebAppStarter.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/WebAppStarter.java
@@ -35,7 +35,7 @@ import org.eclipse.jetty.webapp.WebAppContext;
 public class WebAppStarter {
 
     private static final Map<String, Long> warModTimes = new ConcurrentHashMap<String, Long>();
-    static final Map INIT_PARAMS = new HashMap(4);
+    static final Map<String, String> INIT_PARAMS = new HashMap<String, String>(4);
     //static private Log _log;
 
     static {