diff --git a/apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java
index fdf2b46ac..b4163aacc 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java
@@ -414,10 +414,10 @@ public class SummaryHelper extends HelperBase {
     }
     
     /** compare translated nicknames - put "shared clients" first in the sort */
-    private class AlphaComparator implements Comparator {
-        public int compare(Object lhs, Object rhs) {
-            String lname = getName((Destination)lhs);
-            String rname = getName((Destination)rhs);
+    private class AlphaComparator implements Comparator<Destination> {
+        public int compare(Destination lhs, Destination rhs) {
+            String lname = getName(lhs);
+            String rname = getName(rhs);
             String xsc = _("shared clients");
             if (lname.equals(xsc))
                 return -1;
diff --git a/build.xml b/build.xml
index 5f451aa3b..ed7ec5166 100644
--- a/build.xml
+++ b/build.xml
@@ -714,7 +714,7 @@
             <arg value="i2pupdate.sud" />
         </java>
         <!-- will this use the monotonerc file in the current workspace? -->
-        <echo message="Checking out fresh copy into ../i2p-${release-number} for tarballing:" />
+        <echo message="Checking out fresh copy into ../i2p-${release.number} for tarballing:" />
         <delete dir="../i2p-${release.number}" />
         <exec executable="mtn" failonerror="true">
             <arg value="co" />
@@ -768,7 +768,7 @@
             <arg value="i2pupdate_${release.number}.zip" />
             <arg value="i2pupdate.sud" />
         </exec>
-        <echo message="Don't forget to mtn tag h: i2p-${release.number}" />
+        <echo message="Don't forget to mtn tag w: i2p-${release.number}" />
         <echo message="... and mtn cert t:i2p-${release.number} branch i2p.i2p.release" />
     </target>
 </project>
diff --git a/core/java/src/net/i2p/client/HandlerImpl.java b/core/java/src/net/i2p/client/HandlerImpl.java
index 57380e44e..98d1e76ff 100644
--- a/core/java/src/net/i2p/client/HandlerImpl.java
+++ b/core/java/src/net/i2p/client/HandlerImpl.java
@@ -25,10 +25,10 @@ abstract class HandlerImpl implements I2CPMessageHandler {
     public HandlerImpl(I2PAppContext context, int type) {
         _context = context;
         _type = type;
-        _log = new Log(getClass());
+        _log = context.logManager().getLog(getClass());
     }
     
     public int getType() {
         return _type;
     }
-}
\ No newline at end of file
+}