diff --git a/prowler/providers/aws/services/codeartifact/codeartifact_packages_external_public_publishing_disabled/codeartifact_packages_external_public_publishing_disabled.py b/prowler/providers/aws/services/codeartifact/codeartifact_packages_external_public_publishing_disabled/codeartifact_packages_external_public_publishing_disabled.py
index 509b5289b4..98e199a736 100644
--- a/prowler/providers/aws/services/codeartifact/codeartifact_packages_external_public_publishing_disabled/codeartifact_packages_external_public_publishing_disabled.py
+++ b/prowler/providers/aws/services/codeartifact/codeartifact_packages_external_public_publishing_disabled/codeartifact_packages_external_public_publishing_disabled.py
@@ -33,6 +33,6 @@ def execute(self):
                         report.status = "PASS"
                         report.status_extended = f"Internal package {package.name} is not vulnerable to dependency confusion in repository {repository.arn}"
 
-                findings.append(report)
+                    findings.append(report)
 
         return findings
diff --git a/prowler/providers/aws/services/directoryservice/directoryservice_service.py b/prowler/providers/aws/services/directoryservice/directoryservice_service.py
index 0eb6d99976..16dca679ef 100644
--- a/prowler/providers/aws/services/directoryservice/directoryservice_service.py
+++ b/prowler/providers/aws/services/directoryservice/directoryservice_service.py
@@ -38,15 +38,17 @@ def __describe_directories__(self, regional_client):
                     ):
                         directory_id = directory["DirectoryId"]
                         directory_name = directory["Name"]
-                        directory_type = directory["Type"]
+                        directory_type = DirectoryType(directory["Type"])
                         # Radius Configuration
                         radius_authentication_protocol = (
-                            directory["RadiusSettings"]["AuthenticationProtocol"]
+                            AuthenticationProtocol(
+                                directory["RadiusSettings"]["AuthenticationProtocol"]
+                            )
                             if "RadiusSettings" in directory
                             else None
                         )
                         radius_status = (
-                            directory["RadiusStatus"]
+                            RadiusStatus(directory["RadiusStatus"])
                             if "RadiusStatus" in directory
                             else None
                         )
@@ -114,7 +116,7 @@ def __describe_event_topics__(self, regional_client):
                                 EventTopics(
                                     topic_arn=event_topic["TopicArn"],
                                     topic_name=event_topic["TopicName"],
-                                    status=event_topic["Status"],
+                                    status=EventTopicStatus(event_topic["Status"]),
                                     created_date_time=event_topic["CreatedDateTime"],
                                 )
                             )
@@ -147,11 +149,13 @@ def __list_certificates__(self, regional_client):
                                     Certificate(
                                         id=certificate_info["CertificateId"],
                                         common_name=certificate_info["CommonName"],
-                                        state=certificate_info["State"],
+                                        state=CertificateState(
+                                            certificate_info["State"]
+                                        ),
                                         expiry_date_time=certificate_info[
                                             "ExpiryDateTime"
                                         ],
-                                        type=certificate_info["Type"],
+                                        type=CertificateType(certificate_info["Type"]),
                                     )
                                 )
                         self.directories[directory.id].certificates = certificates
diff --git a/prowler/providers/aws/services/emr/emr_cluster_publicly_accesible/emr_cluster_publicly_accesible.py b/prowler/providers/aws/services/emr/emr_cluster_publicly_accesible/emr_cluster_publicly_accesible.py
index dfc288959b..aa6510b5f6 100644
--- a/prowler/providers/aws/services/emr/emr_cluster_publicly_accesible/emr_cluster_publicly_accesible.py
+++ b/prowler/providers/aws/services/emr/emr_cluster_publicly_accesible/emr_cluster_publicly_accesible.py
@@ -86,6 +86,6 @@ def execute(self):
                             else ""
                         )
 
-                    findings.append(report)
+                findings.append(report)
 
         return findings