diff --git a/NOTICE b/NOTICE
index 1177b93ec0f5ae4ee8e854e25d31db02a3f8b73f..563e81afaa2b1ab16e9128cf6de9b738404184f2 100755
--- a/NOTICE
+++ b/NOTICE
@@ -29,7 +29,7 @@ The following software have components provided under the terms of this license:
 - google-cloud-storage (from https://github.com/GoogleCloudPlatform/google-cloud-python, https://github.com/googleapis/python-storage)
 - google-crc32c (from https://github.com/googleapis/python-crc32c)
 - google-resumable-media (from https://github.com/googleapis/google-resumable-media-python)
-- googleapis-common-protos (from https://github.com/googleapis/google-cloud-python/tree/main/packages/googleapis-common-protos)
+- googleapis-common-protos (from https://pypi.org/project/googleapis-common-protos/)
 - kubernetes (from https://github.com/kubernetes-client/python)
 - packaging (from https://pypi.org/project/packaging/, https://pypi.org/project/packaging/22.0/)
 - proto-plus (from https://pypi.org/project/proto-plus/)
diff --git a/deployment/default-policies/entitlements.rego b/deployment/default-policies/entitlements.rego
index d4a0de05a7fa042e4a3cb2823338acdb377d7289..88858f289c9feb6a6e9c3df086b7f6daad699b3f 100644
--- a/deployment/default-policies/entitlements.rego
+++ b/deployment/default-policies/entitlements.rego
@@ -6,7 +6,7 @@ headers = {
     "Content-Type": "application/json",
     "data-partition-id":input.datapartitionid,
     "Authorization": sprintf("Bearer %v", [input.token]),
-    "x-user-id": input.xuserid,
+    "x-user-id": object.get(input, "xuserid", null),
     "Accept": "application/json"
 }
 
diff --git a/deployment/default-policies/legal.rego b/deployment/default-policies/legal.rego
index 36f9ac6a6d8f29f143837bc7c85aa94e96137e53..52115c64f4564be8f87da9d3ec7fa3aeaf3ea58e 100644
--- a/deployment/default-policies/legal.rego
+++ b/deployment/default-policies/legal.rego
@@ -6,7 +6,7 @@ headers = {
     "content-type": "application/json",
     "data-partition-id":input.datapartitionid,
     "authorization": sprintf("Bearer %v", [input.token]),
-    "x-user-id": input.xuserid,
+    "x-user-id": object.get(input, "xuserid", null),
     "accept": "application/json"
 }