diff --git a/Sources/epoch_code/compile/inventory/EPOCH_selectInventoryItem.sqf b/Sources/epoch_code/compile/inventory/EPOCH_selectInventoryItem.sqf
index e8950ce2..e7c63db3 100644
--- a/Sources/epoch_code/compile/inventory/EPOCH_selectInventoryItem.sqf
+++ b/Sources/epoch_code/compile/inventory/EPOCH_selectInventoryItem.sqf
@@ -46,8 +46,8 @@ if (_data == "") then {
     _container = switch (_idc) do {
         case 633: { uniformContainer player };
         case 638: { vestContainer player };
-        case 632: { EPOCH_targetContainer };
-        case 640: { EPOCH_secondaryContainer };
+        case 632: { if (isnull EPOCH_secondaryContainer) then {EPOCH_targetContainer} else {EPOCH_secondaryContainer} };
+        case 640: { EPOCH_targetContainer };
         default { backpackContainer player };
     };
     _weaponsAndItems = ((getWeaponCargo  _container) select 0);
diff --git a/Sources/epoch_config/Configs/CfgBaseBuilding.hpp b/Sources/epoch_config/Configs/CfgBaseBuilding.hpp
index 3ba3a503..faa89e29 100644
--- a/Sources/epoch_config/Configs/CfgBaseBuilding.hpp
+++ b/Sources/epoch_config/Configs/CfgBaseBuilding.hpp
@@ -219,6 +219,7 @@ class CfgBaseBuilding
     class WoodQuarterFloor_Ghost_EPOCH : WoodQuarterFloor_SIM_EPOCH {};
     class MetalFloor_EPOCH : Default
     {
+        upgradeBuilding[] = {{"CinderFloor_EPOCH",{{"CinderBlocks",2},{"MortarBucket",2}}}};
         removeParts[] = {{"ItemCorrugatedLg",2}};
         simulClass = "MetalFloor_SIM_EPOCH";
         staticClass = "MetalFloor_EPOCH";