diff --git a/factory/glideFactoryEntry.py b/factory/glideFactoryEntry.py
diff --git a/factory/glideFactoryInterface.py b/factory/glideFactoryInterface.py
@@ -271,10 +271,10 @@ def advertizeGlidein(factory_name, glidein_name, entry_name, trust_domain, auth_
             fd.write('GlideinName = "%s"\n' % glidein_name)
             fd.write('EntryName = "%s"\n' % entry_name)
             fd.write('%s = "%s"\n' % (factoryConfig.factory_signtype_id, string.join(supported_signtypes, ',')))
-            if pub_key_obj != None:
-                fd.write('PubKeyID = "%s"\n' % pub_key_obj.get_pub_key_id())
-                fd.write('PubKeyType = "%s"\n' % pub_key_obj.get_pub_key_type())
-                fd.write('PubKeyValue = "%s"\n' % string.replace(pub_key_obj.get_pub_key_value(), '\n', '\\n'))
+            # Must have a key to communicate
+            fd.write('PubKeyID = "%s"\n' % pub_key_obj.get_pub_key_id())
+            fd.write('PubKeyType = "%s"\n' % pub_key_obj.get_pub_key_type())
+            fd.write('PubKeyValue = "%s"\n' % string.replace(pub_key_obj.get_pub_key_value(), '\n', '\\n'))
             if 'grid_proxy' in auth_method:
                 fd.write('GlideinAllowx509_Proxy = %s\n' % True)
                 fd.write('GlideinRequirex509_Proxy = %s\n' % True)

diff --git a/factory/glideFactoryLib.py b/factory/glideFactoryLib.py
diff --git a/factory/glideFactoryMonitoring.py b/factory/glideFactoryMonitoring.py
@@ -274,7 +274,7 @@ def logRequest(self, client_name, requests):
 
         At the moment, it looks only for
           'IdleGlideins'
-          'MaxRunningGlideins'
+          'MaxGlideins'
         """
         if self.data.has_key(client_name):
             t_el = self.data[client_name]
@@ -289,7 +289,7 @@ def logRequest(self, client_name, requests):
             el = {}
             t_el['Requested'] = el
 
-        for reqpair in  (('IdleGlideins', 'Idle'), ('MaxRunningGlideins', 'MaxRun')):
+        for reqpair in  (('IdleGlideins', 'Idle'), ('MaxGlideins', 'MaxRun')):
             org, new = reqpair
             if not el.has_key(new):
                 el[new] = 0

diff --git a/frontend/glideinFrontendInterface.py b/frontend/glideinFrontendInterface.py
@@ -638,7 +638,7 @@ def createAdvertizeWorkFile(self, factory_pool, params_obj, key_obj=None):
                     if (hasattr(credential_el,'pilot_fname')):
                         glidein_params_to_encrypt['GlideinProxy']=credential_el.file_id(credential_el.pilot_fname);
                     (req_idle,req_max_run)=credential_el.get_usage_details()
-                    logSupport.log.info("Advertizing credential %s with (%d idle, %d max run)"%(credential_el.filename,req_idle,req_max_run))
+                    logSupport.log.info("Advertizing credential %s with (%d idle, %d max run) for request %s"%(credential_el.filename, req_idle, req_max_run, params_obj.request_name))
 
                 if (frontendConfig.advertise_use_multi==True):
                     fname=self.adname
@@ -670,7 +670,7 @@ def createAdvertizeWorkFile(self, factory_pool, params_obj, key_obj=None):
 
 
                 fd.write('ReqIdleGlideins = %i\n'%req_idle)
-                fd.write('ReqMaxRunningGlideins = %i\n'%req_max_run)
+                fd.write('ReqMaxGlideins = %i\n'%req_max_run)
                 fd.write('ReqRemoveExcess = "%s"\n'%params_obj.remove_excess_str)
 
                 # write out both the params and monitors