diff --git a/opensciencegrid/ospool-ganglia/51-ganglia-ce-dashboards.conf b/opensciencegrid/ospool-ganglia/51-ganglia-ce-dashboards.conf
index 760df23c..b0eff07a 100644
--- a/opensciencegrid/ospool-ganglia/51-ganglia-ce-dashboards.conf
+++ b/opensciencegrid/ospool-ganglia/51-ganglia-ce-dashboards.conf
@@ -6,7 +6,7 @@ GANGLIAD_CE.CONDOR_HOST = chtc-spark-ce1.svc.opensciencegrid.org
 GANGLIAD_CE.COLLECTOR_HOST = chtc-spark-ce1.svc.opensciencegrid.org:9619
 GANGLIAD_CE.GANGLIAD_LOG = $(GANGLIAD_LOG).ce
 GANGLIAD_CE.GANGLIAD_METRICS_CONFIG_DIR = $(GANGLIAD_METRICS_CONFIG_DIR)/ce_dashboards
-GANGLIAD_CE.GANGLIAD_DEBUG = D_FULLDEBUG
+# GANGLIAD_CE.GANGLIAD_DEBUG = D_FULLDEBUG
 
 # Enable reset metrics functionality, which first appears in
 # HTCSS version 23.6.x.  This functionality is critical to keeping
diff --git a/opensciencegrid/ospool-ganglia/ganglia.d/ce_dashboards/51_ce_dashboard_metrics b/opensciencegrid/ospool-ganglia/ganglia.d/ce_dashboards/51_ce_dashboard_metrics
index b5ae7c76..9d0914cd 100644
--- a/opensciencegrid/ospool-ganglia/ganglia.d/ce_dashboards/51_ce_dashboard_metrics
+++ b/opensciencegrid/ospool-ganglia/ganglia.d/ce_dashboards/51_ce_dashboard_metrics
@@ -18,9 +18,9 @@
   Aggregate = "SUM";
   Name   = "BcusInUse";
   Desc   = "Number of 1core-4GB-4GB Basic Computing Units provisioned";
-  Value  = floor(min({totalslotcpus,totalslotmemory/1024/4,totalslotdisk/1024/1024/4}))-floor(min({cpus,Memory/1024/4,Disk/1024/1024/4}));
+  Value  = floor(min({totalslotcpus,totalslotmemory/1024/4,totalslotdisk/1024/1024/4}))-(PartitionableSlot=?=True * floor(min({cpus,Memory/1024/4,Disk/1024/1024/4})));
   Units  = "Basic Computing Units";
-  Requirements = PartitionableSlot=?=True;
+  Requirements = PartitionableSlot=?=True || (SlotType=?="Static" && State=?="Claimed");
   TargetType = "Machine";
 ]
 [
@@ -29,7 +29,7 @@
   Desc   = "Number of 1core-4GB-4GB Basic Computing Units not provisioned";
   Value  = floor(min({cpus,Memory/1024/4,Disk/1024/1024/4}));
   Units  = "Basic Computing Units";
-  Requirements = PartitionableSlot=?=True;
+  Requirements = PartitionableSlot=?=True || (SlotType=?="Static" && State=!="Claimed");
   TargetType = "Machine";
 ]
 [