diff --git a/ui-ngx/src/app/modules/home/pages/tenant/tenant.component.html b/ui-ngx/src/app/modules/home/pages/tenant/tenant.component.html
index 335a7d3c9a..3f22741130 100644
--- a/ui-ngx/src/app/modules/home/pages/tenant/tenant.component.html
+++ b/ui-ngx/src/app/modules/home/pages/tenant/tenant.component.html
@@ -56,7 +56,7 @@
         </mat-form-field>
       </div>
       <tb-contact [parentForm]="entityForm" [isEdit]="isEdit"></tb-contact>
-      <div fxLayout="column">
+      <!--div fxLayout="column">
         <mat-checkbox class="hinted-checkbox" formControlName="isolatedTbCore">
           <div>{{ 'tenant.isolated-tb-core' | translate }}</div>
           <div class="tb-hint">{{'tenant.isolated-tb-core-details' | translate}}</div>
@@ -65,7 +65,7 @@
           <div>{{ 'tenant.isolated-tb-rule-engine' | translate }}</div>
           <div class="tb-hint">{{'tenant.isolated-tb-rule-engine-details' | translate}}</div>
         </mat-checkbox>
-      </div>
+      </div-->
     </fieldset>
   </form>
 </div>
diff --git a/ui-ngx/src/app/modules/home/pages/tenant/tenants-table-config.resolver.ts b/ui-ngx/src/app/modules/home/pages/tenant/tenants-table-config.resolver.ts
index b1515ee62d..c3c0c14e88 100644
--- a/ui-ngx/src/app/modules/home/pages/tenant/tenants-table-config.resolver.ts
+++ b/ui-ngx/src/app/modules/home/pages/tenant/tenants-table-config.resolver.ts
@@ -51,8 +51,8 @@ export class TenantsTableConfigResolver implements Resolve<EntityTableConfig<Ten
 
     this.config.columns.push(
       new DateEntityTableColumn<TenantInfo>('createdTime', 'common.created-time', this.datePipe, '150px'),
-      new EntityTableColumn<TenantInfo>('title', 'tenant-profile.tenant-profile', '20%'),
-      new EntityTableColumn<TenantInfo>('tenantProfileName', 'tenant.title', '20%'),
+      new EntityTableColumn<TenantInfo>('title', 'tenant.title', '20%'),
+      new EntityTableColumn<TenantInfo>('tenantProfileName', 'tenant-profile.tenant-profile', '20%'),
       new EntityTableColumn<TenantInfo>('email', 'contact.email', '20%'),
       new EntityTableColumn<TenantInfo>('country', 'contact.country', '20%'),
       new EntityTableColumn<TenantInfo>('city', 'contact.city', '20%')
diff --git a/ui-ngx/src/app/shared/models/device.models.ts b/ui-ngx/src/app/shared/models/device.models.ts
index 74f48a09bd..bb15f5b2c5 100644
--- a/ui-ngx/src/app/shared/models/device.models.ts
+++ b/ui-ngx/src/app/shared/models/device.models.ts
@@ -83,8 +83,8 @@ export interface Device extends BaseData<DeviceId> {
   name: string;
   type: string;
   label: string;
-  deviceProfileId: DeviceProfileId;
-  deviceData: DeviceData;
+  deviceProfileId?: DeviceProfileId;
+  deviceData?: DeviceData;
   additionalInfo?: any;
 }
 
diff --git a/ui-ngx/src/assets/locale/locale.constant-en_US.json b/ui-ngx/src/assets/locale/locale.constant-en_US.json
index 5cab0a7284..19d079395d 100644
--- a/ui-ngx/src/assets/locale/locale.constant-en_US.json
+++ b/ui-ngx/src/assets/locale/locale.constant-en_US.json
@@ -2085,4 +2085,4 @@
             "ka_GE": "ქართული"
         }
     }
-},
+}