diff --git a/src/decisionengine_modules/glideinwms/glide_frontend_element.py b/src/decisionengine_modules/glideinwms/glide_frontend_element.py
index 13becad1..ebf10572 100644
--- a/src/decisionengine_modules/glideinwms/glide_frontend_element.py
+++ b/src/decisionengine_modules/glideinwms/glide_frontend_element.py
@@ -52,7 +52,7 @@ def __init__(self, fe_group, acct_group, fe_cfg, logger):
         # Default parameters for glidein request
         self.default_glidein_params = {
             # TODO: Remove this classad once token/proxy hybrid configurations are no longer supported
-            "CONTINUE_IF_NO_PROXY": "False"
+            "CONTINUE_IF_NO_PROXY": "True"
         }
 
     def generate_glidein_requests(self, jobs_df, slots_df, entries, factory_globals, job_filter="ClusterId > 0"):
diff --git a/src/decisionengine_modules/glideinwms/transforms/glidein_requests.py b/src/decisionengine_modules/glideinwms/transforms/glidein_requests.py
index 1a0b32ca..c5c37d27 100644
--- a/src/decisionengine_modules/glideinwms/transforms/glidein_requests.py
+++ b/src/decisionengine_modules/glideinwms/transforms/glidein_requests.py
@@ -24,7 +24,8 @@
     "Nersc_Figure_Of_Merit",
 ]
 
-_SUPPORTED_ENTRY_TYPES = ["LCF", "AWS", "Grid", "GCE"]
+# _SUPPORTED_ENTRY_TYPES = ["LCF", "AWS", "Grid", "GCE"]
+_SUPPORTED_ENTRY_TYPES = ["Grid"]
 
 METRICS = {
     "NUMBER_OF_JOBS": Gauge("de_jobs_total", "Number of jobs seen by the Decision Engine"),
@@ -86,12 +87,9 @@ def transform(self, datablock):
             # Get factory global classad dataframe
             factory_globals = datablock.get("factoryglobal_manifests")
             factory_entries = datablock.get("Factory_Entries")
-            entries = pandas.DataFrame([])
-            all_factory_entries = [
-                factory_entries.xs(et) for et in _SUPPORTED_ENTRY_TYPES if et in factory_entries.index
-            ]
-            if all_factory_entries:
-                entries = pandas.DataFrame(pandas.concat(all_factory_entries, ignore_index=True, sort=True))
+            entries = pandas.DataFrame(
+                pandas.concat([factory_entries.xs(et) for et in _SUPPORTED_ENTRY_TYPES], ignore_index=True, sort=True)
+            )
             if entries.empty:
                 self.logger.info("There are no entries to request resources from")
                 return dict.fromkeys(["glideclientglobal_manifests", "glideclient_manifests"], pandas.DataFrame())
diff --git a/src/decisionengine_modules/glideinwms/transforms/grid_figure_of_merit.py b/src/decisionengine_modules/glideinwms/transforms/grid_figure_of_merit.py
index 14046b56..9272b1be 100644
--- a/src/decisionengine_modules/glideinwms/transforms/grid_figure_of_merit.py
+++ b/src/decisionengine_modules/glideinwms/transforms/grid_figure_of_merit.py
@@ -25,9 +25,7 @@ def transform(self, datablock):
         """
 
         self.logger.debug("in GridFigureOfMerit transform")
-        entries = pandas.DataFrame([])
-        if "Grid" in self.Factory_Entries(datablock).index:
-            entries = self.Factory_Entries(datablock).xs("Grid")
+        entries = self.Factory_Entries(datablock).xs("Grid")
         if entries is None:
             entries = pandas.DataFrame({ATTR_ENTRYNAME: []})
         foms = []
diff --git a/src/decisionengine_modules/htcondor/publishers/publisher.py b/src/decisionengine_modules/htcondor/publishers/publisher.py
index 89311e26..23d6fc55 100644
--- a/src/decisionengine_modules/htcondor/publishers/publisher.py
+++ b/src/decisionengine_modules/htcondor/publishers/publisher.py
@@ -29,8 +29,10 @@ def __init__(self, config):
         super().__init__(config)
         self.condor_config = config.get("condor_config")
         self.x509_user_proxy = config.get("x509_user_proxy")
-        self.max_retries = config.get("max_retries")
-        self.retry_interval = config.get("retry_interval")
+        # self.max_retries = config.get("max_retries")
+        self.max_retries = 10
+        # self.retry_interval = config.get("retry_interval")
+        self.retry_interval = 1
         self.update_ad_command = DEFAULT_UPDATE_AD_COMMAND
         self.invalidate_ad_command = DEFAULT_INVALIDATE_AD_COMMAND
         self.classad_type = "generic"