diff --git a/src/js/game/core.js b/src/js/game/core.js
index a0ee3713..fd4f8482 100644
--- a/src/js/game/core.js
+++ b/src/js/game/core.js
@@ -425,7 +425,12 @@ export class GameCore {
 
         root.camera.transform(context);
 
-        assert(context.globalAlpha === 1.0, "Global alpha not 1 on frame start");
+        if (context.globalAlpha !== 1.0) {
+            console.warn("Global Alpha not set back to 1 on Frame Begin");
+            context.globalAlpha = 1;
+        }
+
+        // assert(context.globalAlpha === 1.0, "Global alpha not 1 on frame start");
 
         // Update hud
         root.hud.update();
diff --git a/src/js/game/hud/parts/mass_selector.js b/src/js/game/hud/parts/mass_selector.js
index 6dc9203a..946d672c 100644
--- a/src/js/game/hud/parts/mass_selector.js
+++ b/src/js/game/hud/parts/mass_selector.js
@@ -1,24 +1,17 @@
-import { globalConfig } from "../../../core/config";
-import { makeDiv, formatBigNumber, formatBigNumberFull } from "../../../core/utils";
-import { DynamicDomAttach } from "../dynamic_dom_attach";
-import { MapChunkView } from "../../map_chunk_view";
+import { formatBigNumberFull } from "../../../core/utils";
 import { DrawParameters } from "../../../core/draw_parameters";
-import { gMetaBuildingRegistry } from "../../../core/global_registries";
 import { createLogger } from "../../../core/logging";
 import { STOP_PROPAGATION } from "../../../core/signal";
 import { Vector } from "../../../core/vector";
 import { ACHIEVEMENTS } from "../../../platform/achievement_provider";
 import { T } from "../../../translations";
 import { Blueprint } from "../../blueprint";
-import { MetaBlockBuilding } from "../../buildings/block";
-import { MetaConstantProducerBuilding } from "../../buildings/constant_producer";
 import { enumMouseButton } from "../../camera";
 import { Component } from "../../component";
 import { Entity } from "../../entity";
 import { KEYMAPPINGS } from "../../key_action_mapper";
 import { THEME } from "../../theme";
 import { enumHubGoalRewards } from "../../tutorial_goals";
-import { StaticMapEntityComponent } from "../../components/static_map_entity";
 import { BaseHUDPart } from "../base_hud_part";
 
 const logger = createLogger("hud/mass_selector");
@@ -155,13 +148,12 @@ export class HUDMassSelector extends BaseHUDPart {
     }
 
     clearBelts() {
-        for (const uid of this.selectedUids) {
-            const entity = this.root.entityMgr.findByUid(uid);
+        for (const entity of this.selectedEntities) {
             for (const component of Object.values(entity.components)) {
                 /** @type {Component} */ (component).clear();
             }
         }
-        this.selectedUids = new Set();
+        this.selectedEntities = [];
     }
 
     confirmCut() {
@@ -363,7 +355,7 @@ export class HUDMassSelector extends BaseHUDPart {
                             }
 
                             renderedUids.add(uid);
-                            this.RenderSelectonPreviewTile(parameters, entity);
+                            this.renderSelectonPreviewTile(parameters, entity);
                         }
                     }
                 }
@@ -373,13 +365,8 @@ export class HUDMassSelector extends BaseHUDPart {
         //EXTREMELY SLOW. There must be a better way. (Possibly use a Array)
         for (let i = 0; i < this.selectedEntities.length; ++i) {
             const entity = this.selectedEntities[i];
-            this.RenderSelectonPreviewTile(parameters, entity);
+            this.renderSelectonPreviewTile(parameters, entity);
         }
-        // this.selectedUids.forEach(uid => {
-        //     const entity = this.root.entityMgr.findByUid(uid);
-
-        //     this.RenderSelectonPreviewTile(parameters, entity);
-        // });
 
         parameters.context.globalAlpha = 1;
     }
@@ -388,7 +375,7 @@ export class HUDMassSelector extends BaseHUDPart {
      * @param {DrawParameters} parameters
      * @param {Entity} entity
      */
-    RenderSelectonPreviewTile(parameters, entity) {
+    renderSelectonPreviewTile(parameters, entity) {
         const staticComp = entity.components.StaticMapEntity;
 
         parameters.context.globalAlpha = entity.layer == this.root.currentLayer ? 1 : 0.7;
diff --git a/src/js/game/hud/parts/shape_tooltip.js b/src/js/game/hud/parts/shape_tooltip.js
index aabe7fa1..0eaedc5d 100644
--- a/src/js/game/hud/parts/shape_tooltip.js
+++ b/src/js/game/hud/parts/shape_tooltip.js
@@ -38,7 +38,7 @@ export class HUDShapeTooltip extends BaseHUDPart {
             active &&
             !this.isPlacingBuilding &&
             !hudParts.massSelector.currentSelectionStartWorld &&
-            hudParts.massSelector.selectedUids.size < 1 &&
+            hudParts.massSelector.selectedEntities.length < 1 &&
             !hudParts.blueprintPlacer.currentBlueprint.get()
         );
     }
diff --git a/src/js/game/systems/map_resources.js b/src/js/game/systems/map_resources.js
index 807afb36..56dd0da4 100644
--- a/src/js/game/systems/map_resources.js
+++ b/src/js/game/systems/map_resources.js
@@ -118,5 +118,6 @@ export class MapResourcesSystem extends GameSystem {
             context.fillRect(0, 0, w, 1);
             context.fillRect(0, 1, 1, h);
         }
+        context.globalAlpha = 1;
     }
 }