Fixed errors in schema creation scripts after merge