diff --git a/fail/bin/fail-x86-tracing b/fail/bin/fail-x86-tracing
index 04846c9..897d0c0 100755
--- a/fail/bin/fail-x86-tracing
+++ b/fail/bin/fail-x86-tracing
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0810cb612b7b5bc0e9485a6b499253d8f7ca6e3a133096db396d13e9f881a707
-size 21437120
+oid sha256:6a94e901d148a12d41ef52e54f74cd60484545f5cda15f7a8e2d64ff0f882b2d
+size 21992800
diff --git a/fail/bin/generic-experiment-client b/fail/bin/generic-experiment-client
index c3fd163..9edc607 100755
--- a/fail/bin/generic-experiment-client
+++ b/fail/bin/generic-experiment-client
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:584214e3439e62591ac3b21b43bbd374137a1a8101a3f191054075fea35118a5
-size 25567248
+oid sha256:31cd858c44e442a977b0cc23585fda5418e5ba19b618912aa9a04a3013ddae1a
+size 26196616
diff --git a/fail/bin/generic-experiment-server b/fail/bin/generic-experiment-server
index 5950f26..7626169 100755
--- a/fail/bin/generic-experiment-server
+++ b/fail/bin/generic-experiment-server
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a36268c32352d6a0d71ac519682e1d5195153cf2faf982ed691ee85e2c3926b7
-size 12607768
+oid sha256:703d434c6233fc8650f1491f656337178cc25dac60b3e854be81efd10cd2f84a
+size 12512296
diff --git a/fail/bin/import-trace b/fail/bin/import-trace
index b647b63..8e3ea3e 100755
--- a/fail/bin/import-trace
+++ b/fail/bin/import-trace
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1c6d4fcd2c94c635ca8e176a0031f01ee21dedab764ec4320f480cdecd1ecdbf
-size 13468904
+oid sha256:d12fd39e3752cab30136bbcf91e00f19c0e85ede81b8d421f56a7940377e4c85
+size 15507040
diff --git a/fail/bin/prune-trace b/fail/bin/prune-trace
index cef495d..c9d7c85 100755
--- a/fail/bin/prune-trace
+++ b/fail/bin/prune-trace
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:97a1fe328b6ecb98d609c4eb2d6b7d4f74c67af88cb18e3d6b37d2af29b712dd
-size 8744232
+oid sha256:eee5b74efe3e6d2958686cfe6d43e16201793e83d26e877df5389a4d635f90a9
+size 9095528
diff --git a/scripts/Queries/Faults.pm b/scripts/Queries/Faults.pm
index 1e4ede5..f453f29 100644
--- a/scripts/Queries/Faults.pm
+++ b/scripts/Queries/Faults.pm
@@ -12,7 +12,7 @@ benchmark, resulttype, SUM(t.time2 - t.time1 + 1) AS faults,
 CONCAT('0x', HEX(p.injection_instr_absolute)) AS fault_address
 FROM variant v
 JOIN trace t ON v.id = t.variant_id
-JOIN fspgroup g ON g.variant_id = t.variant_id AND g.instr2 = t.instr2 AND g.data_address = t.data_address
+JOIN fspgroup g ON g.variant_id = t.variant_id AND g.instr2 = t.instr2 AND g.data_physical_address = t.data_physical_address
 JOIN result_GenericExperimentMessage r ON r.pilot_id = g.pilot_id
 JOIN fsppilot p ON r.pilot_id = p.id
 WHERE v.variant = '$experiment'
diff --git a/scripts/Queries/Results.pm b/scripts/Queries/Results.pm
index e3f7b5e..c918ac0 100644
--- a/scripts/Queries/Results.pm
+++ b/scripts/Queries/Results.pm
@@ -11,7 +11,7 @@ sub query {
 benchmark, resulttype, sum(t.time2 - t.time1 + 1) AS faults
 FROM variant v
 JOIN trace t ON v.id = t.variant_id
-JOIN fspgroup g ON g.variant_id = t.variant_id AND g.instr2 = t.instr2 AND g.data_address = t.data_address
+JOIN fspgroup g ON g.variant_id = t.variant_id AND g.instr2 = t.instr2 AND g.data_physical_address = t.data_physical_address
 JOIN result_GenericExperimentMessage r ON r.pilot_id = g.pilot_id
 JOIN fsppilot p ON r.pilot_id = p.id
 WHERE v.variant = '$experiment'
diff --git a/scripts/Queries/ResultsData.pm b/scripts/Queries/ResultsData.pm
index 37ca851..75f6d2c 100644
--- a/scripts/Queries/ResultsData.pm
+++ b/scripts/Queries/ResultsData.pm
@@ -11,7 +11,7 @@ sub query {
 benchmark, resulttype, sum(t.time2 - t.time1 + 1) AS faults
 FROM variant v
 JOIN trace t ON v.id = t.variant_id
-JOIN fspgroup g ON g.variant_id = t.variant_id AND g.instr2 = t.instr2 AND g.data_address = t.data_address
+JOIN fspgroup g ON g.variant_id = t.variant_id AND g.instr2 = t.instr2 AND g.data_physical_address = t.data_physical_address
 JOIN result_GenericExperimentMessage r ON r.pilot_id = g.pilot_id
 JOIN fsppilot p ON r.pilot_id = p.id
 WHERE v.variant = '$experiment'