diff --git a/modules/aggregation-layers/src/heatmap-layer/heatmap-layer.ts b/modules/aggregation-layers/src/heatmap-layer/heatmap-layer.ts
index 928d9c7baa8..fad958c9031 100644
--- a/modules/aggregation-layers/src/heatmap-layer/heatmap-layer.ts
+++ b/modules/aggregation-layers/src/heatmap-layer/heatmap-layer.ts
@@ -486,8 +486,8 @@ export default class HeatmapLayer<
     const viewportCorners = [
       viewport.unproject([0, 0]),
       viewport.unproject([viewport.width, 0]),
-      viewport.unproject([viewport.width, viewport.height]),
-      viewport.unproject([0, viewport.height])
+      viewport.unproject([0, viewport.height]),
+      viewport.unproject([viewport.width, viewport.height])
     ].map(p => p.map(Math.fround));
 
     // #1: get world bounds for current viewport extends
diff --git a/modules/aggregation-layers/src/heatmap-layer/triangle-layer.ts b/modules/aggregation-layers/src/heatmap-layer/triangle-layer.ts
index cbeebfb7a0f..d1da42ed894 100644
--- a/modules/aggregation-layers/src/heatmap-layer/triangle-layer.ts
+++ b/modules/aggregation-layers/src/heatmap-layer/triangle-layer.ts
@@ -65,7 +65,7 @@ export default class TriangleLayer extends Layer<_TriangleLayerProps> {
         {name: 'positions', format: 'float32x3'},
         {name: 'texCoords', format: 'float32x2'}
       ],
-      topology: 'triangle-fan-webgl',
+      topology: 'triangle-strip',
       vertexCount
     });
   }
diff --git a/modules/layers/src/text-layer/text-background-layer/text-background-layer.ts b/modules/layers/src/text-layer/text-background-layer/text-background-layer.ts
index be607b2681b..5f407bed1f9 100644
--- a/modules/layers/src/text-layer/text-background-layer/text-background-layer.ts
+++ b/modules/layers/src/text-layer/text-background-layer/text-background-layer.ts
@@ -159,14 +159,14 @@ export default class TextBackgroundLayer<DataT = any, ExtraPropsT extends {} = {
 
   protected _getModel(): Model {
     // a square that minimally cover the unit circle
-    const positions = [0, 0, 1, 0, 1, 1, 0, 1];
+    const positions = [0, 0, 1, 0, 0, 1, 1, 1];
 
     return new Model(this.context.device, {
       ...this.getShaders(),
       id: this.props.id,
       bufferLayout: this.getAttributeManager()!.getBufferLayouts(),
       geometry: new Geometry({
-        topology: 'triangle-fan-webgl',
+        topology: 'triangle-strip',
         vertexCount: 4,
         attributes: {
           positions: {size: 2, value: new Float32Array(positions)}