diff --git a/connect/endpoint.go b/connect/endpoint.go
index ad4c8687..c8647259 100644
--- a/connect/endpoint.go
+++ b/connect/endpoint.go
@@ -32,7 +32,7 @@ func makeConnectEndpoint(svc Service) endpoint.Endpoint {
 		var err error
 		switch req.Status {
 		case "Acknowledged":
-			total, err := svc.Acknowledge(ctx, request.(mdm.Response))
+			total, err := svc.Acknowledge(ctx, req)
 			if err != nil {
 				return mdmConnectResponse{Err: err}, nil
 			}
@@ -40,14 +40,14 @@ func makeConnectEndpoint(svc Service) endpoint.Endpoint {
 				return mdmConnectResponse{}, nil
 			}
 			if total != 0 {
-				next, _, err := svc.NextCommand(ctx, request.(mdm.Response))
+				next, _, err := svc.NextCommand(ctx, req)
 				if err != nil {
 					return mdmConnectResponse{Err: err}, nil
 				}
 				return mdmConnectResponse{payload: next}, nil
 			}
 		case "Idle":
-			next, total, err := svc.NextCommand(ctx, request.(mdm.Response))
+			next, total, err := svc.NextCommand(ctx, req)
 			if err != nil {
 				return mdmConnectResponse{Err: err}, nil
 			}
diff --git a/device/datastore.go b/device/datastore.go
index 52e4f03d..b4b9a4f0 100644
--- a/device/datastore.go
+++ b/device/datastore.go
@@ -53,7 +53,7 @@ var (
 	meid
 	)
     VALUES ($1,$2,$3,$4,$5,$6,$7,$8) 
-    ON CONFLICT (udid)
+    ON CONFLICT (udid, serial_number)
     DO UPDATE SET
 	apple_mdm_topic=$2,
     os_version=$3,