diff --git a/src/core/logic/logic.layout.js b/src/core/logic/logic.layout.js
index 94cac3b2f..8b4abc85a 100644
--- a/src/core/logic/logic.layout.js
+++ b/src/core/logic/logic.layout.js
@@ -32,7 +32,7 @@ BI.VerticalLayoutLogic = BI.inherit(BI.Logic, {
         } else {
             layout = "bi.vtape";
         }
-        return _.pickBy({
+        return BI._.pickBy({
             type: layout,
             scrollable: o.scrollable,
             scrolly: o.scrolly,
@@ -50,7 +50,7 @@ BI.VerticalLayoutLogic = BI.inherit(BI.Logic, {
             verticalAlign: o.verticalAlign,
             columnSize: o.columnSize,
             rowSize: o.rowSize
-        }, _.identity);
+        }, BI._.identity);
     }
 });
 
@@ -89,7 +89,7 @@ BI.HorizontalLayoutLogic = BI.inherit(BI.Logic, {
         } else {
             layout = "bi.htape";
         }
-        return _.pickBy({
+        return BI._.pickBy({
             type: layout,
             scrollable: o.scrollable,
             scrolly: o.scrolly,
@@ -107,7 +107,7 @@ BI.HorizontalLayoutLogic = BI.inherit(BI.Logic, {
             verticalAlign: o.verticalAlign,
             columnSize: o.columnSize,
             rowSize: o.rowSize
-        }, _.identity);
+        }, BI._.identity);
     }
 });
 
@@ -143,7 +143,7 @@ BI.TableLayoutLogic = BI.inherit(BI.Logic, {
         } else {
             layout = "bi.window";
         }
-        return _.pickBy({
+        return BI._.pickBy({
             type: layout,
             scrollable: o.scrollable,
             scrolly: o.scrolly,
@@ -157,7 +157,7 @@ BI.TableLayoutLogic = BI.inherit(BI.Logic, {
             verticalAlign: o.verticalAlign,
             columnSize: o.columnSize,
             rowSize: o.rowSize
-        }, _.identity);
+        }, BI._.identity);
     }
 });
 
@@ -198,7 +198,7 @@ BI.HorizontalFillLayoutLogic = BI.inherit(BI.Logic, {
         } else {
             layout = "bi.htape";
         }
-        return _.pickBy({
+        return BI._.pickBy({
             type: layout,
             scrollable: o.scrollable,
             scrolly: o.scrolly,
@@ -216,6 +216,6 @@ BI.HorizontalFillLayoutLogic = BI.inherit(BI.Logic, {
             verticalAlign: o.verticalAlign,
             columnSize: columnSize,
             rowSize: o.rowSize
-        }, _.identity);
+        }, BI._.identity);
     }
 });
diff --git a/typescript/shims-tsx.ts b/typescript/shims-tsx.ts
index e77dceffb..cabf21b78 100644
--- a/typescript/shims-tsx.ts
+++ b/typescript/shims-tsx.ts
@@ -13,6 +13,12 @@ interface UIProps {
     bgap: number;
     vgap: number;
     hgap: number;
+    _rgap: number;
+    _lgap: number;
+    _tgap: number;
+    _bgap: number;
+    _hgap: number;
+    _vgap: number;
     inset: number | string;
 }