diff --git a/core/src/test/java/com/google/bitcoin/core/PeerGroupTest.java b/core/src/test/java/com/google/bitcoin/core/PeerGroupTest.java
index 342af25f..61b56e00 100644
--- a/core/src/test/java/com/google/bitcoin/core/PeerGroupTest.java
+++ b/core/src/test/java/com/google/bitcoin/core/PeerGroupTest.java
@@ -405,7 +405,7 @@ public class PeerGroupTest extends TestWithNetworkConnections {
     }
 
     @Test
-    public void commonChainHeights() throws Exception {
+    public void downloadPeerSelection() throws Exception {
         peerGroup.startAndWait();
         VersionMessage versionMessage2 = new VersionMessage(params, 2);
         VersionMessage versionMessage3 = new VersionMessage(params, 3);
@@ -413,7 +413,7 @@ public class PeerGroupTest extends TestWithNetworkConnections {
         Peer a = PeerGroup.peerFromChannel(connectPeer(1, versionMessage2));
         assertEquals(2, peerGroup.getMostCommonChainHeight());
         assertEquals(a, peerGroup.getDownloadPeer());
-        Peer b = PeerGroup.peerFromChannel(connectPeer(2, versionMessage2));
+        PeerGroup.peerFromChannel(connectPeer(2, versionMessage2));
         assertEquals(2, peerGroup.getMostCommonChainHeight());
         assertEquals(a, peerGroup.getDownloadPeer());  // No change.
         Peer c = PeerGroup.peerFromChannel(connectPeer(3, versionMessage3));
@@ -422,7 +422,6 @@ public class PeerGroupTest extends TestWithNetworkConnections {
         PeerGroup.peerFromChannel(connectPeer(4, versionMessage3));
         assertEquals(3, peerGroup.getMostCommonChainHeight());
         assertEquals(c, peerGroup.getDownloadPeer());  // Switch to first peer advertising new height.
-
         // New peer with a higher protocol version but same chain height.
         VersionMessage versionMessage4 = new VersionMessage(params, 3);
         versionMessage4.clientVersion = 100000;
diff --git a/examples/src/main/java/com/google/bitcoin/examples/PeerMonitor.java b/examples/src/main/java/com/google/bitcoin/examples/PeerMonitor.java
index 1feac967..63f2b641 100644
--- a/examples/src/main/java/com/google/bitcoin/examples/PeerMonitor.java
+++ b/examples/src/main/java/com/google/bitcoin/examples/PeerMonitor.java
@@ -214,11 +214,7 @@ public class PeerMonitor {
                     return peer.getBestHeight();
                 case PING_TIME:
                 case LAST_PING_TIME:
-                    long time = col == PING_TIME ? peer.getPingTime() : peer.getLastPingTime();
-                    if (time == Long.MAX_VALUE)
-                        return 0L;
-                    else
-                        return time;
+                    return col == PING_TIME ? peer.getPingTime() : peer.getLastPingTime();
 
                 default: throw new RuntimeException();
             }
@@ -267,7 +263,7 @@ public class PeerMonitor {
             }
 
             boolean isPingColumn = column == PeerTableModel.PING_TIME || column == PeerTableModel.LAST_PING_TIME;
-            if (isPingColumn && contents == (Long)0L) {
+            if (isPingColumn && contents.equals(Long.MAX_VALUE)) {
                 // We don't know the answer yet
                 str = "";
             }