diff --git a/hold-for-merge b/hold-for-merge
index 233bdac0b..7db783e33 100644
--- a/hold-for-merge
+++ b/hold-for-merge
@@ -1,5 +1,6 @@
 # -*- conf-mode -*-
 
+personal/rcross/v5.12.4.dev0@9307	# Failed pyflakes, fixed in 9308
 personal/rcross/v5.7.3-dev0@8640	# Rework: make the check_permissions() decorator handle the case where the user isn't logged in
 personal/rcross/v5.6.3-dev0@8237	# Includes other merges; merge personal/rcross/v5.6.2-dev0@8216 instead
 personal/liudapeng/v5.5.1-dev0@7925	# alternative resolution desired
diff --git a/ietf/bin/generate-draft-aliases b/ietf/bin/generate-draft-aliases
index e49d8a456..f1d096762 100755
--- a/ietf/bin/generate-draft-aliases
+++ b/ietf/bin/generate-draft-aliases
@@ -133,7 +133,8 @@ if __name__ == '__main__':
     for draft in interesting_drafts.distinct().iterator():
         # Omit RFCs, we care only about drafts
         if draft.docalias_set.filter(name__startswith='rfc'):
-            continue
+            if  (datetime.datetime.now() - draft.latest_event(type='published_rfc').time) > datetime.timedelta(days= 365 * 3 ):
+                continue
 
         alias = draft.name
         all = []
diff --git a/ietf/group/utils.py b/ietf/group/utils.py
index cf07229ae..44f6d90db 100644
--- a/ietf/group/utils.py
+++ b/ietf/group/utils.py
@@ -48,7 +48,7 @@ def get_area_ads_emails(area):
     if area.acronym == 'none':
         return []
     emails = [r.email.email_address()
-              for r in area.role_set.filter(name__in=('ad', 'chair'))]
+              for r in area.role_set.filter(name__in=('pre-ad', 'ad', 'chair'))]
     return filter(None, emails)
 
 def get_group_ads_emails(wg):