diff --git a/prowler/providers/aws/services/efs/efs_service.py b/prowler/providers/aws/services/efs/efs_service.py
index 90ce1a86..86a0f6bd 100644
--- a/prowler/providers/aws/services/efs/efs_service.py
+++ b/prowler/providers/aws/services/efs/efs_service.py
@@ -1,3 +1,4 @@
+import json
 import threading
 from dataclasses import dataclass
 
@@ -74,7 +75,7 @@ class EFS:
                                 FileSystemId=filesystem.id
                             )
                             if "Policy" in fs_policy:
-                                filesystem.policy = fs_policy["Policy"]
+                                filesystem.policy = json.loads(fs_policy["Policy"])
                         except ClientError as e:
                             if e.response["Error"]["Code"] == "PolicyNotFound":
                                 filesystem.policy = {}
diff --git a/prowler/providers/aws/services/s3/s3_bucket_public_access/s3_bucket_public_access.py b/prowler/providers/aws/services/s3/s3_bucket_public_access/s3_bucket_public_access.py
index 3888426b..d70e39e9 100644
--- a/prowler/providers/aws/services/s3/s3_bucket_public_access/s3_bucket_public_access.py
+++ b/prowler/providers/aws/services/s3/s3_bucket_public_access/s3_bucket_public_access.py
@@ -53,7 +53,8 @@ class s3_bucket_public_access(Check):
                                 report.status_extended = f"S3 Bucket {bucket.name} has public access due to bucket policy."
                             else:
                                 if (
-                                    "AWS" in statement["Principal"]
+                                    "Principal" in statement
+                                    and "AWS" in statement["Principal"]
                                     and statement["Effect"] == "Allow"
                                 ):
                                     if type(statement["Principal"]["AWS"]) == str:
diff --git a/prowler/providers/aws/services/vpc/vpc_endpoint_connections_trust_boundaries/vpc_endpoint_connections_trust_boundaries.py b/prowler/providers/aws/services/vpc/vpc_endpoint_connections_trust_boundaries/vpc_endpoint_connections_trust_boundaries.py
index 6451ecd2..7eb73700 100644
--- a/prowler/providers/aws/services/vpc/vpc_endpoint_connections_trust_boundaries/vpc_endpoint_connections_trust_boundaries.py
+++ b/prowler/providers/aws/services/vpc/vpc_endpoint_connections_trust_boundaries/vpc_endpoint_connections_trust_boundaries.py
@@ -26,20 +26,25 @@ class vpc_endpoint_connections_trust_boundaries(Check):
                     else:
                         principals = statement["Principal"]["AWS"]
                     for principal_arn in principals:
-                        account_id = principal_arn.split(":")[4]
                         report = Check_Report_AWS(self.metadata())
                         report.region = endpoint.region
-                        if (
-                            account_id in trusted_account_ids
-                            or account_id in vpc_client.audited_account
-                        ):
-                            report.status = "PASS"
-                            report.status_extended = f"Found trusted account {account_id} in VPC Endpoint {endpoint.id} in VPC {endpoint.vpc_id}."
+                        if principal_arn == "*":
+                            report.status = "FAIL"
+                            report.status_extended = f"VPC Endpoint {endpoint.id} in VPC {endpoint.vpc_id} has full access."
                             report.resource_id = endpoint.id
                         else:
-                            report.status = "FAIL"
-                            report.status_extended = f"Found untrusted account {account_id} in VPC Endpoint {endpoint.id} in VPC {endpoint.vpc_id}."
-                            report.resource_id = endpoint.id
+                            account_id = principal_arn.split(":")[4]
+                            if (
+                                account_id in trusted_account_ids
+                                or account_id in vpc_client.audited_account
+                            ):
+                                report.status = "PASS"
+                                report.status_extended = f"Found trusted account {account_id} in VPC Endpoint {endpoint.id} in VPC {endpoint.vpc_id}."
+                                report.resource_id = endpoint.id
+                            else:
+                                report.status = "FAIL"
+                                report.status_extended = f"Found untrusted account {account_id} in VPC Endpoint {endpoint.id} in VPC {endpoint.vpc_id}."
+                                report.resource_id = endpoint.id
                         findings.append(report)
 
         return findings
diff --git a/tests/providers/aws/services/efs/efs_service_test.py b/tests/providers/aws/services/efs/efs_service_test.py
index 349641d4..8bc98443 100644
--- a/tests/providers/aws/services/efs/efs_service_test.py
+++ b/tests/providers/aws/services/efs/efs_service_test.py
@@ -1,3 +1,4 @@
+import json
 from unittest.mock import patch
 
 import botocore
@@ -34,7 +35,7 @@ filesystem_policy = {
 
 def mock_make_api_call(self, operation_name, kwarg):
     if operation_name == "DescribeFileSystemPolicy":
-        return {"FileSystemId": file_system_id, "Policy": filesystem_policy}
+        return {"FileSystemId": file_system_id, "Policy": json.dumps(filesystem_policy)}
     if operation_name == "DescribeBackupPolicy":
         return {"BackupPolicy": {"Status": backup_policy_status}}
     return make_api_call(self, operation_name, kwarg)