diff --git a/sql/CREATE_USER.sql b/sql/CREATE_USER.sql
index d2b9a4f..17c3286 100644
--- a/sql/CREATE_USER.sql
+++ b/sql/CREATE_USER.sql
@@ -3,7 +3,7 @@ WHENEVER SQLERROR EXIT SQL.SQLCODE
 SET DEFINE ON
 
 BEGIN
-  IF NOT (&_O_RELEASE LIKE '1002%' OR &_O_RELEASE LIKE '11%' OR &_O_RELEASE LIKE '12%')
+  IF (SUBSTR(&_O_RELEASE,1,1) > 6 OR SUBSTR(&_O_RELEASE,1,4) < 1002)
   THEN
     RAISE_APPLICATION_ERROR(-20000, 'Database Version not supported');
   END IF;
diff --git a/sql/POLICIES.sql b/sql/POLICIES.sql
index 32b777b..67db066 100644
--- a/sql/POLICIES.sql
+++ b/sql/POLICIES.sql
@@ -50,6 +50,7 @@ BEGIN
     function_schema  => '&_vUsername',
     policy_function  => 'FILTER_ACCESS',
     statement_types  => 'INDEX, INSERT, UPDATE, DELETE',
+    update_check => TRUE,   /* Required for 12.2+ (MOS Doc ID 2327695.1) */
     enable => TRUE,
     static_policy => TRUE
    );
@@ -64,6 +65,7 @@ BEGIN
     function_schema  => '&_vUsername',
     policy_function  => 'FILTER_ACCESS',
     statement_types  => 'INDEX, INSERT, UPDATE, DELETE',
+    update_check => TRUE,   /* Required for 12.2+ (MOS Doc ID 2327695.1) */
     enable => TRUE,
     static_policy => TRUE
    );
@@ -78,6 +80,7 @@ BEGIN
     function_schema  => '&_vUsername',
     policy_function  => 'FILTER_ACCESS',
     statement_types  => 'INDEX, INSERT, UPDATE, DELETE',
+    update_check => TRUE,   /* Required for 12.2+ (MOS Doc ID 2327695.1) */
     enable => TRUE,
     static_policy => TRUE
    );
diff --git a/sql/USER_PRIVS.sql b/sql/USER_PRIVS.sql
index 5417afb..ec50dd7 100644
--- a/sql/USER_PRIVS.sql
+++ b/sql/USER_PRIVS.sql
@@ -6,3 +6,11 @@ GRANT EXECUTE ON DBMS_CRYPTO TO &_vUsername -- To encrypt user Keys
 /
 GRANT SELECT ON V_$SESSION TO &_vUsername   -- For remembering user login data (machine name, os user, terminal, etc)
 /
+
+BEGIN
+   $IF (DBMS_DB_VERSION.VERSION=12 AND DBMS_DB_VERSION.RELEASE=2) OR DBMS_DB_VERSION.VERSION>12 $THEN
+      EXECUTE IMMEDIATE 'GRANT ADMINISTER DATABASE TRIGGER TO &_vUsername';  -- Required for 12.2+ (MOS Doc ID 2275535.1)
+   $ELSE NULL;
+   $END
+END;
+/