diff --git a/geowebcache/arcgiscache/src/main/java/org/geowebcache/arcgis/config/CacheInfoPersister.java b/geowebcache/arcgiscache/src/main/java/org/geowebcache/arcgis/config/CacheInfoPersister.java
index 360f162f0c..3bb65decb5 100644
--- a/geowebcache/arcgiscache/src/main/java/org/geowebcache/arcgis/config/CacheInfoPersister.java
+++ b/geowebcache/arcgiscache/src/main/java/org/geowebcache/arcgis/config/CacheInfoPersister.java
@@ -39,7 +39,7 @@ XStream getConfiguredXStream() {
         // TODO: replace this with a more narrow whitelist
         xs.allowTypesByWildcard(new String[] {"org.geowebcache.**"});
 
-        xs.setMode(XStream.NO_REFERENCES);
+        xs.setMode(XStream.ID_REFERENCES);
 
         xs.alias("SpatialReference", SpatialReference.class);
         xs.alias("TileOrigin", TileOrigin.class);
diff --git a/geowebcache/core/src/main/java/org/geowebcache/grid/ResolutionMismatchException.java b/geowebcache/core/src/main/java/org/geowebcache/grid/ResolutionMismatchException.java
index 798e97657a..a67af76bfe 100644
--- a/geowebcache/core/src/main/java/org/geowebcache/grid/ResolutionMismatchException.java
+++ b/geowebcache/core/src/main/java/org/geowebcache/grid/ResolutionMismatchException.java
@@ -20,7 +20,7 @@ public ResolutionMismatchException(double wRes, double bestResolution) {
                 + wRes
                 + " , best match: "
                 + bestResolution
-                + " exceeds 10% threshold. Perhaps the client is configured "
+                + " exceeds ALLOWED_RESOLUTION_THRESHOLD. Perhaps the client is configured "
                 + " with an incorrect set of scales (resolutions), "
                 + " or the DPI setting is off compared to the one in GWC ?");
     }
diff --git a/geowebcache/core/src/test/java/org/geowebcache/config/BlobStoreConfigurationTest.java b/geowebcache/core/src/test/java/org/geowebcache/config/BlobStoreConfigurationTest.java
index 147b58c300..b45d377a54 100644
--- a/geowebcache/core/src/test/java/org/geowebcache/config/BlobStoreConfigurationTest.java
+++ b/geowebcache/core/src/test/java/org/geowebcache/config/BlobStoreConfigurationTest.java
@@ -219,7 +219,7 @@ public void testMultipleListenersHearAdd() throws Exception {
         this.config.addBlobStoreListener(listener1);
         this.config.addBlobStoreListener(listener2);
         BlobStoreInfo goodInfo = this.getGoodInfo("test", 1);
-        listener1.handleAddBlobStore(EasyMock.eq(goodInfo));
+        listener1.handleAddBlobStore(EasyMock.eq(goodInfo)); // No change, checking rest of file
         EasyMock.expectLastCall().once();
         listener2.handleAddBlobStore(EasyMock.eq(goodInfo));
         EasyMock.expectLastCall().once();