diff --git a/MARS_Packages/REL02_POST/MARS-1409/diagnose_workflow_key_status.sql b/MARS_Packages/REL02_POST/MARS-1409-POSTHOOK/02_MARS_1409_POSTHOOK_diagnose_workflow_key_status.sql
similarity index 100%
rename from MARS_Packages/REL02_POST/MARS-1409/diagnose_workflow_key_status.sql
rename to MARS_Packages/REL02_POST/MARS-1409-POSTHOOK/02_MARS_1409_POSTHOOK_diagnose_workflow_key_status.sql
diff --git a/MARS_Packages/REL02_POST/MARS-1409-POSTHOOK/install_mars1409_posthook.sql b/MARS_Packages/REL02_POST/MARS-1409-POSTHOOK/install_mars1409_posthook.sql
index e7c460b..bcef169 100644
--- a/MARS_Packages/REL02_POST/MARS-1409-POSTHOOK/install_mars1409_posthook.sql
+++ b/MARS_Packages/REL02_POST/MARS-1409-POSTHOOK/install_mars1409_posthook.sql
@@ -59,6 +59,12 @@ PROMPT STEP 1: Backfill A_WORKFLOW_HISTORY_KEY for existing records
 PROMPT ============================================================================
 @@01_MARS_1409_POSTHOOK_update_existing_workflow_keys.sql
 
+PROMPT
+PROMPT ============================================================================
+PROMPT STEP 2: Diagnose workflow key status
+PROMPT ============================================================================
+@@02_MARS_1409_POSTHOOK_diagnose_workflow_key_status.sql
+
 PROMPT
 PROMPT ============================================================================
 PROMPT MARS-1409-POSTHOOK Installation Complete
diff --git a/MARS_Packages/REL02_POST/MARS-1409/verify_packages_version.sql b/MARS_Packages/REL02_POST/MARS-1409/verify_packages_version.sql
index b72d7d4..fd16b21 100644
--- a/MARS_Packages/REL02_POST/MARS-1409/verify_packages_version.sql
+++ b/MARS_Packages/REL02_POST/MARS-1409/verify_packages_version.sql
@@ -30,8 +30,9 @@ SELECT CT_MRDS.ENV_MANAGER.GET_BUILD_INFO() AS BUILD_INFO FROM DUAL;
 PROMPT
 PROMPT Package Compilation Status:
 SELECT object_name, object_type, status, last_ddl_time
-FROM user_objects
-WHERE object_name IN ('FILE_MANAGER', 'ENV_MANAGER', 'FILE_ARCHIVER')
+FROM all_objects
+WHERE owner = 'CT_MRDS'
+  AND object_name IN ('FILE_MANAGER', 'ENV_MANAGER', 'FILE_ARCHIVER')
   AND object_type IN ('PACKAGE', 'PACKAGE BODY')
 ORDER BY object_name, object_type;
 
@@ -39,8 +40,9 @@ ORDER BY object_name, object_type;
 PROMPT
 PROMPT Compilation Errors (if any):
 SELECT name, type, line, position, text
-FROM user_errors
-WHERE name IN ('FILE_MANAGER', 'ENV_MANAGER', 'FILE_ARCHIVER')
+FROM all_errors
+WHERE owner = 'CT_MRDS'
+  AND name IN ('FILE_MANAGER', 'ENV_MANAGER', 'FILE_ARCHIVER')
 ORDER BY name, type, line, position;
 
 PROMPT