diff --git a/database/src/main/dataset_schema/_schema.ddl b/database/src/main/dataset_schema/_schema.ddl
index c3c20207f1..55ab89a96e 100644
--- a/database/src/main/dataset_schema/_schema.ddl
+++ b/database/src/main/dataset_schema/_schema.ddl
@@ -14,3 +14,5 @@
  */
 
 CREATE SCHEMA IF NOT EXISTS dataset_schema AUTHORIZATION enceladus;
+
+GRANT USAGE ON SCHEMA dataset_schema TO menas;
diff --git a/database/src/main/dataset_schema/add_schema.sql b/database/src/main/dataset_schema/add_schema.sql
index 216fee4d11..61c1e9c730 100644
--- a/database/src/main/dataset_schema/add_schema.sql
+++ b/database/src/main/dataset_schema/add_schema.sql
@@ -57,7 +57,7 @@ DECLARE
     _locked         BOOLEAN;
     _deleted        BOOLEAN;
 BEGIN
-    SELECT dsh.schema_latest_version, dsh.locked_when IS NOT NULL, dsh.deleted_when IS NOT NULL
+    SELECT dsh.schema_latest_version, dsh.locked_when IS NOT NULL, dsh.disabled_when IS NOT NULL
     FROM dataset_schema.heads dsh
     WHERE dsh.schema_name = i_schema_name
     FOR UPDATE
@@ -92,7 +92,7 @@ BEGIN
 
     INSERT INTO dataset_schema.schemas (schema_name, schema_version, schema_description, fields, updated_by)
     VALUES (i_schema_name, i_schema_version, i_schema_description, i_fields, i_user_name)
-    RETURNING id_schema
+    RETURNING dataset_schema.schemas.id_schema
     INTO id_schema;
 
     IF _latest_version = 0 THEN
diff --git a/database/src/main/public/global_id.sql b/database/src/main/public/global_id.sql
index 9766288b6a..f3af584196 100644
--- a/database/src/main/public/global_id.sql
+++ b/database/src/main/public/global_id.sql
@@ -19,8 +19,8 @@
 -- SERVER should be a unique number within your deployment between 0 and 9222
 CREATE SEQUENCE IF NOT EXISTS public.global_id_seq
     INCREMENT 1
-    START [SERVER_ID]*1000000000000000
-    MINVALUE [SERVER_ID]*1000000000000000
+    START [SERVER_ID]*1000000000000000+1
+    MINVALUE [SERVER_ID]*1000000000000000+1
     MAXVALUE [SERVER_ID] + 1)*1000000000000000
     CACHE 10;