diff --git a/SpiNNaker-allocserv/src/main/java/uk/ac/manchester/spinnaker/alloc/bmp/TransceiverFactory.java b/SpiNNaker-allocserv/src/main/java/uk/ac/manchester/spinnaker/alloc/bmp/TransceiverFactory.java
index c77c66b911..cbc22757bd 100644
--- a/SpiNNaker-allocserv/src/main/java/uk/ac/manchester/spinnaker/alloc/bmp/TransceiverFactory.java
+++ b/SpiNNaker-allocserv/src/main/java/uk/ac/manchester/spinnaker/alloc/bmp/TransceiverFactory.java
@@ -295,7 +295,9 @@ public Blacklist getCurrentBlacklist() {
 			@Override
 			public void setFactory(TestTransceiverFactory factory) {
 				testFactory = factory;
-				txrxMap.clear();
+				synchronized (txrxMap) {
+					txrxMap.clear();
+				}
 			}
 		};
 	}
diff --git a/SpiNNaker-allocserv/src/main/java/uk/ac/manchester/spinnaker/alloc/web/ControllerUtils.java b/SpiNNaker-allocserv/src/main/java/uk/ac/manchester/spinnaker/alloc/web/ControllerUtils.java
index 072fb26097..c23cfabd44 100644
--- a/SpiNNaker-allocserv/src/main/java/uk/ac/manchester/spinnaker/alloc/web/ControllerUtils.java
+++ b/SpiNNaker-allocserv/src/main/java/uk/ac/manchester/spinnaker/alloc/web/ControllerUtils.java
@@ -140,7 +140,7 @@ public static final class ViewFactory {
 		 * @param viewName
 		 *            The name of the view that this class will make.
 		 */
-		public ViewFactory(@CompileTimeConstant String viewName) {
+		public ViewFactory(@CompileTimeConstant final String viewName) {
 			view = viewName;
 		}