diff --git a/openid-connect-server-webapp/src/main/resources/db/oracle/oracle_database_tables.sql b/openid-connect-server-webapp/src/main/resources/db/oracle/oracle_database_tables.sql
index 9f430adac..e5d56fc66 100644
--- a/openid-connect-server-webapp/src/main/resources/db/oracle/oracle_database_tables.sql
+++ b/openid-connect-server-webapp/src/main/resources/db/oracle/oracle_database_tables.sql
@@ -180,8 +180,7 @@ CREATE TABLE client_details (
   initiate_login_uri VARCHAR2(2048),
   clear_access_tokens_on_refresh NUMBER(1) DEFAULT 1 NOT NULL,
   
-  software_statement VARCHAR(4096),
-  software_id VARCHAR(2048),
+  software_id VARCHAR2(2048),
   software_statement VARCHAR2(4000),
 	
   code_challenge_method VARCHAR2(256),
@@ -255,7 +254,7 @@ CREATE TABLE system_scope (
   description VARCHAR2(4000),
   icon VARCHAR2(256),
   restricted NUMBER(1) DEFAULT 0 NOT NULL,
-  default_scope NUMBER(1) DEFAULT 0 NOT NULL
+  default_scope NUMBER(1) DEFAULT 0 NOT NULL,
 
   CONSTRAINT system_scope_unique UNIQUE (scope),
   CONSTRAINT default_scope_check CHECK (default_scope in (1,0)),
@@ -395,22 +394,23 @@ CREATE TABLE saved_registered_client (
 );
 CREATE SEQUENCE saved_registered_client_seq START WITH 1 INCREMENT BY 1 NOCACHE NOCYCLE;
 
-CREATE TABLE IF NOT EXISTS device_code (
+CREATE TABLE device_code (
 	id NUMBER(19) NOT NULL PRIMARY KEY,
 	device_code VARCHAR2(1024),
 	user_code VARCHAR2(1024),
 	expiration TIMESTAMP,
 	client_id VARCHAR2(256),
-	approved BOOLEAN,
-	auth_holder_id NUMBER(19)	
+	approved NUMBER(1),
+	auth_holder_id NUMBER(19),
+  CONSTRAINT dc_approved_check CHECK (approved in (1,0))
 );
 
-CREATE TABLE IF NOT EXISTS device_code_scope (
+CREATE TABLE device_code_scope (
 	owner_id NUMBER(19) NOT NULL,
 	scope VARCHAR2(256) NOT NULL
 );
 
-CREATE TABLE IF NOT EXISTS device_code_request_parameter (
+CREATE TABLE device_code_request_parameter (
 	owner_id NUMBER(19),
 	param VARCHAR2(2048),
 	val VARCHAR2(2048)
diff --git a/openid-connect-server-webapp/src/main/resources/db/oracle/scopes_oracle.sql b/openid-connect-server-webapp/src/main/resources/db/oracle/scopes_oracle.sql
index bb6bc82a2..313bc45fc 100644
--- a/openid-connect-server-webapp/src/main/resources/db/oracle/scopes_oracle.sql
+++ b/openid-connect-server-webapp/src/main/resources/db/oracle/scopes_oracle.sql
@@ -11,7 +11,7 @@ INSERT INTO system_scope_TEMP (scope, description, icon, restricted, default_sco
 INSERT INTO system_scope_TEMP (scope, description, icon, restricted, default_scope) VALUES
   ('address', 'physical address', 'home', 0, 1);
 INSERT INTO system_scope_TEMP (scope, description, icon, restricted, default_scope) VALUES
-  ('phone', 'telephone number', 'bell', 0, 1, 0);
+  ('phone', 'telephone number', 'bell', 0, 1);
 INSERT INTO system_scope_TEMP (scope, description, icon, restricted, default_scope) VALUES
   ('offline_access', 'offline access', 'time', 0, 0);
 --