diff --git a/server/AyaNova/util/AySchema.cs b/server/AyaNova/util/AySchema.cs
index 55c80fb2..6fb87497 100644
--- a/server/AyaNova/util/AySchema.cs
+++ b/server/AyaNova/util/AySchema.cs
@@ -317,15 +317,14 @@ $BODY$;
 ");
 
                 //Name fetcher function
+                //CoreBizObject ADD here
                 await ExecQueryAsync(@"
 CREATE OR REPLACE FUNCTION PUBLIC.AYGETNAME(IN AYOBJECTID BIGINT, IN AYOBJECTTYPE INTEGER) RETURNS TEXT AS $BODY$
 DECLARE
   aytable TEXT DEFAULT '';
   aynamecolumn TEXT DEFAULT 'name';
   returnstr TEXT DEFAULT '';
-BEGIN
-	-- Object type to table name
-    -- //CoreBizObject ADD here
+BEGIN	
 	case ayobjecttype
         when 0 then return 'LT:NoType';
         when 1 then return 'LT:Global';
@@ -396,9 +395,9 @@ BEGIN
         when 66 then aytable = 'apartwarehouse';
         when 67 then aytable = 'apartinventory'; aynamecolumn='description';
 		   else
-	    	  RETURN format('??PUBLIC.AYGETNAME-UNKNOWN_TYPE:%S',ayobjecttype);-- This should not happen unless dev forgot to update this
+	    	  RETURN returnstr;
 	end case;
-	EXECUTE format('SELECT %I FROM %I WHERE id = %L', aynamecolumn, aytable, ayobjectid)  INTO returnstr;
+	EXECUTE format('SELECT %I FROM %I WHERE id = %L', aynamecolumn, aytable, ayobjectid) INTO returnstr;
     RETURN returnstr;
 END;
 $BODY$ LANGUAGE PLPGSQL STABLE");
@@ -670,7 +669,7 @@ $BODY$ LANGUAGE PLPGSQL STABLE");
                 //PARTWAREHOUSE                
                 await ExecQueryAsync("CREATE TABLE apartwarehouse (id BIGINT GENERATED ALWAYS AS IDENTITY PRIMARY KEY, name TEXT NOT NULL UNIQUE, active BOOL NOT NULL, " +
                 "notes TEXT, wiki TEXT, customfields TEXT, tags VARCHAR(255) ARRAY)");
-                await ExecQueryAsync("INSERT INTO apartwarehouse(name, active) VALUES ('#1', true);");
+                await ExecQueryAsync("INSERT INTO apartwarehouse(name, active) VALUES ('Default', true);");
 
                 //PARTSERIAL
                 await ExecQueryAsync("CREATE TABLE apartserial (id BIGINT GENERATED ALWAYS AS IDENTITY PRIMARY KEY, serial TEXT NOT NULL, " +
@@ -698,7 +697,7 @@ $BODY$ LANGUAGE PLPGSQL STABLE");
                 "CONSTRAINT fk_partinventory_self FOREIGN KEY (sourceid, sourcetype, lastentrydate, lastbalance) REFERENCES apartinventory(sourceid, sourcetype, entrydate, balance), " +
                 "CONSTRAINT chk_partinventory_valid_balance CHECK(balance >= 0 AND (balance = COALESCE(lastbalance, 0) + quantity)), " +
                 "CONSTRAINT chk_partinventory_valid_dates_sequence CHECK(lastentrydate < entrydate), " +
-                "CONSTRAINT chk_partinventory_valid_previous_columns CHECK((lastentrydate IS NULL AND lastbalance IS NULL) OR (lastentrydate IS NOT NULL AND lastbalance IS NOT NULL)) " +
+                "CONSTRAINT chk_partinventory_valid_previous_columns CHECK((lastentrydate IS NULL AND lastbalance IS NULL) OR (lastentrydate IS NOT NULL AND lastbalance IS NOT NULL)), " +
                 "CONSTRAINT chk_partinventory_valid_source CHECK((sourcetype IS NULL AND sourceid IS NULL) OR (sourcetype IS NOT NULL AND sourceid IS NOT NULL)) " +
                 " )");