diff --git a/modules/dcache-vehicles/src/main/java/diskCacheV111/vehicles/CacheStatistics.java b/modules/dcache-vehicles/src/main/java/diskCacheV111/vehicles/CacheStatistics.java
index 7025d995b1d..aa7046eb557 100644
--- a/modules/dcache-vehicles/src/main/java/diskCacheV111/vehicles/CacheStatistics.java
+++ b/modules/dcache-vehicles/src/main/java/diskCacheV111/vehicles/CacheStatistics.java
@@ -53,8 +53,8 @@ public CacheStatistics(String pnfsString) {
 	try {
 	    _totalAccesses = Integer.parseInt(st.nextToken());
 	    _accessTime    = Long.parseLong(st.nextToken());
-	    _score         = new Float(st.nextToken());
-	    _halfLife      = new Float(st.nextToken());
+	    _score         =  Float.valueOf(st.nextToken());
+	    _halfLife      =  Float.valueOf(st.nextToken());
 	} catch (Exception e){
 	    throw new IllegalArgumentException(pnfsString);
 	}
@@ -149,14 +149,11 @@ public int compareTo(CacheStatistics other ){
         //
         //XXX this needs to use the half-life algorithm
         //
-	if (_totalAccesses == other.getTotalAccesses()){
-            return _accessTime>other.getAccessTime()?-1:_accessTime==other.getAccessTime()?0:1;
-//	    return (new Long(_accessTime)).compareTo(new Long(other.getAccessTime()));
-	} else {
-            return _totalAccesses>other.getTotalAccesses()?
-                      -1:_totalAccesses==other.getTotalAccesses()?0:1;
-//	    return (new Integer(_totalAccesses)).compareTo(new Integer(other.getTotalAccesses()));
-	}
+		if (_totalAccesses == other.getTotalAccesses()){
+			return Long.compare(other.getAccessTime(), _accessTime);
+		} else {
+			return Integer.compare(other.getTotalAccesses(), _totalAccesses);
+		}
     }
 
     public static void main(String[] args){
diff --git a/modules/ftp-client/src/test/java/org/dcache/ftp/client/test/PerfMarkerTest.java b/modules/ftp-client/src/test/java/org/dcache/ftp/client/test/PerfMarkerTest.java
index 6900f112305..8931c6bb73f 100755
--- a/modules/ftp-client/src/test/java/org/dcache/ftp/client/test/PerfMarkerTest.java
+++ b/modules/ftp-client/src/test/java/org/dcache/ftp/client/test/PerfMarkerTest.java
@@ -123,7 +123,7 @@ public void testObject()
 	testObject(msg,
 			 111222333444.5,
 			 true, 5,
-			 true, new Long("987654321987654321").longValue(),
+			 true, Long.valueOf("987654321987654321").longValue(),
 			 true, 30);
 
 
@@ -138,7 +138,7 @@ true, new Long("987654321987654321").longValue(),
 	testObject(msg,
 			 111222333444.5,
 			 true, 5,
-			 true, new Long("987654321987654321").longValue(),
+			 true, Long.valueOf("987654321987654321").longValue(),
 			 true, 30);
 
 
@@ -166,7 +166,7 @@ true, new Long("987654321987654321").longValue(),
 	testObject(msg,
 			 111222333444.5,
 			 true, 5,
-			 true, new Long("987654321987654321").longValue(),
+			 true, Long.valueOf("987654321987654321").longValue(),
 			 false, 0);