diff --git a/api/ws/handlers/expression-calculate.go b/api/ws/handlers/expression-calculate.go
index 06361a22..f1f4e338 100644
--- a/api/ws/handlers/expression-calculate.go
+++ b/api/ws/handlers/expression-calculate.go
@@ -65,7 +65,7 @@ func HandleExpressionCalculateReq(req *protos.ExpressionCalculateReq, hctx wsHel
 			reqItem.ExpressionId,
 			reqItem.QuantId,
 			reqItem.RoiId,
-			reqItem.Units.Number()-1,
+			reqItem.Units.Number(),
 			exprItem.ModifiedUnixSec,
 			normalSpectraCount,
 			dwellSpectraCount,
diff --git a/build_client.sh b/build_client.sh
old mode 100644
new mode 100755
index 4663cb5a..060216a7
--- a/build_client.sh
+++ b/build_client.sh
@@ -9,7 +9,7 @@ docker run -it --rm \
   -v $PWD:/usr/src/app \
   -w /usr/src/app \
   -e CGO_ENABLED=1 \
-  docker.elastic.co/beats-dev/golang-crossbuild:1.24.2-main \
+  docker.elastic.co/beats-dev/golang-crossbuild:1.24.13-main \
   --build-cmd "go build -buildmode=c-shared -o ./_out/client/pixlise-linux-amd64.so ./core/client/lib" \
   -p "linux/amd64"
 
@@ -18,7 +18,7 @@ docker run -it --rm \
   -v $PWD:/usr/src/app \
   -w /usr/src/app \
   -e CGO_ENABLED=1 \
-  docker.elastic.co/beats-dev/golang-crossbuild:1.24.2-arm \
+  docker.elastic.co/beats-dev/golang-crossbuild:1.24.13-arm \
   --build-cmd "go build -buildmode=c-shared -o ./_out/client/pixlise-linux-arm64.so ./core/client/lib" \
    -p "linux/arm64"
 
@@ -31,7 +31,7 @@ docker run -it --rm \
   -v $PWD:/usr/src/app \
   -w /usr/src/app \
   -e CGO_ENABLED=1 \
-  docker.elastic.co/beats-dev/golang-crossbuild:1.24.2-main \
+  docker.elastic.co/beats-dev/golang-crossbuild:1.24.13-main \
   --build-cmd "go build -buildmode=c-shared -o ./_out/client/pixlise-windows-amd64.dll ./core/client/lib" \
   -p "windows/amd64"
 
@@ -49,7 +49,7 @@ docker run -it \
   -e CC=o64-clang \
   -e GOOS=darwin \
   -e GOARCH=amd64 \
-  docker.elastic.co/beats-dev/golang-crossbuild:1.24.2-darwin \
+  docker.elastic.co/beats-dev/golang-crossbuild:1.24.13-darwin \
   --build-cmd "go build -work -buildmode=c-shared -o ./_out/client/pixlise-darwin-amd64.so ./core/client/lib" \
   -p "darwin/amd64"
 
@@ -62,6 +62,6 @@ docker run -it \
 #   -e CC=o64-clang \
 #   -e GOOS=darwin \
 #   -e GOARCH=arm64 \
-#   docker.elastic.co/beats-dev/golang-crossbuild:1.24.2-darwin \
+#   docker.elastic.co/beats-dev/golang-crossbuild:1.24.13-darwin \
 #   --build-cmd "go build -buildmode=c-shared -o ./_out/client/pixlise-darwin-arm64.so ./core/client/lib" \
 #   -p "darwin/arm64"
diff --git a/data-formats b/data-formats
index 0edfa1df..685624b2 160000
--- a/data-formats
+++ b/data-formats
@@ -1 +1 @@
-Subproject commit 0edfa1df95228267ed32fcbc4e6825cf96786b4f
+Subproject commit 685624b26b0e425e74e4a3127215fdc3d6ece43b
diff --git a/generated-protos/expression-calculate.pb.go b/generated-protos/expression-calculate.pb.go
index e472db70..0e3012fe 100644
--- a/generated-protos/expression-calculate.pb.go
+++ b/generated-protos/expression-calculate.pb.go
@@ -23,25 +23,22 @@ const (
 type DataUnit int32
 
 const (
-	DataUnit_UNIT_UNKNOWN DataUnit = 0 // https://protobuf.dev/programming-guides/dos-donts/ says specify an unknown as 0
-	DataUnit_UNIT_DEFAULT DataUnit = 1
-	DataUnit_UNIT_MMOL    DataUnit = 2
-	DataUnit_UNIT_PPM     DataUnit = 3
+	DataUnit_UNIT_DEFAULT DataUnit = 0 // Doubles as unknown, see https://protobuf.dev/programming-guides/dos-donts/
+	DataUnit_UNIT_MMOL    DataUnit = 1
+	DataUnit_UNIT_PPM     DataUnit = 2
 )
 
 // Enum value maps for DataUnit.
 var (
 	DataUnit_name = map[int32]string{
-		0: "UNIT_UNKNOWN",
-		1: "UNIT_DEFAULT",
-		2: "UNIT_MMOL",
-		3: "UNIT_PPM",
+		0: "UNIT_DEFAULT",
+		1: "UNIT_MMOL",
+		2: "UNIT_PPM",
 	}
 	DataUnit_value = map[string]int32{
-		"UNIT_UNKNOWN": 0,
-		"UNIT_DEFAULT": 1,
-		"UNIT_MMOL":    2,
-		"UNIT_PPM":     3,
+		"UNIT_DEFAULT": 0,
+		"UNIT_MMOL":    1,
+		"UNIT_PPM":     2,
 	}
 )
 
@@ -149,7 +146,7 @@ func (x *DataSourceParams) GetUnits() DataUnit {
 	if x != nil {
 		return x.Units
 	}
-	return DataUnit_UNIT_UNKNOWN
+	return DataUnit_UNIT_DEFAULT
 }
 
 // Grouped results of expressions having run
@@ -337,13 +334,12 @@ var file_expression_calculate_proto_rawDesc = []byte{
 	0x6f, 0x75, 0x72, 0x63, 0x65, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x52, 0x05, 0x71, 0x75, 0x65,
 	0x72, 0x79, 0x12, 0x1e, 0x0a, 0x0a, 0x69, 0x73, 0x50, 0x4d, 0x43, 0x54, 0x61, 0x62, 0x6c, 0x65,
 	0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0a, 0x69, 0x73, 0x50, 0x4d, 0x43, 0x54, 0x61, 0x62,
-	0x6c, 0x65, 0x2a, 0x4b, 0x0a, 0x08, 0x44, 0x61, 0x74, 0x61, 0x55, 0x6e, 0x69, 0x74, 0x12, 0x10,
-	0x0a, 0x0c, 0x55, 0x4e, 0x49, 0x54, 0x5f, 0x55, 0x4e, 0x4b, 0x4e, 0x4f, 0x57, 0x4e, 0x10, 0x00,
-	0x12, 0x10, 0x0a, 0x0c, 0x55, 0x4e, 0x49, 0x54, 0x5f, 0x44, 0x45, 0x46, 0x41, 0x55, 0x4c, 0x54,
-	0x10, 0x01, 0x12, 0x0d, 0x0a, 0x09, 0x55, 0x4e, 0x49, 0x54, 0x5f, 0x4d, 0x4d, 0x4f, 0x4c, 0x10,
-	0x02, 0x12, 0x0c, 0x0a, 0x08, 0x55, 0x4e, 0x49, 0x54, 0x5f, 0x50, 0x50, 0x4d, 0x10, 0x03, 0x42,
-	0x0a, 0x5a, 0x08, 0x2e, 0x3b, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x33,
+	0x6c, 0x65, 0x2a, 0x39, 0x0a, 0x08, 0x44, 0x61, 0x74, 0x61, 0x55, 0x6e, 0x69, 0x74, 0x12, 0x10,
+	0x0a, 0x0c, 0x55, 0x4e, 0x49, 0x54, 0x5f, 0x44, 0x45, 0x46, 0x41, 0x55, 0x4c, 0x54, 0x10, 0x00,
+	0x12, 0x0d, 0x0a, 0x09, 0x55, 0x4e, 0x49, 0x54, 0x5f, 0x4d, 0x4d, 0x4f, 0x4c, 0x10, 0x01, 0x12,
+	0x0c, 0x0a, 0x08, 0x55, 0x4e, 0x49, 0x54, 0x5f, 0x50, 0x50, 0x4d, 0x10, 0x02, 0x42, 0x0a, 0x5a,
+	0x08, 0x2e, 0x3b, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x33,
 }
 
 var (