diff --git a/fm-common/sources/fm_db_sync_event_suppression.py b/fm-common/sources/fm_db_sync_event_suppression.py
index 16777c63..140a7b94 100755
--- a/fm-common/sources/fm_db_sync_event_suppression.py
+++ b/fm-common/sources/fm_db_sync_event_suppression.py
@@ -109,7 +109,7 @@ if not os.path.isfile(EVENT_TYPES_FILE):
 with open(EVENT_TYPES_FILE, 'r') as stream:
     event_types = yaml.load(stream)
 
-for alarm_id in event_types:
+for alarm_id in list(event_types.keys()):
     if isinstance(alarm_id, float):
         # force 3 digits after the decimal point,
         # to include trailing zero's (ex.: 200.010)
diff --git a/fm-rest-api/fm/fm/api/controllers/v1/utils.py b/fm-rest-api/fm/fm/api/controllers/v1/utils.py
index 4370bdd7..fadbea68 100644
--- a/fm-rest-api/fm/fm/api/controllers/v1/utils.py
+++ b/fm-rest-api/fm/fm/api/controllers/v1/utils.py
@@ -59,7 +59,7 @@ def validate_limit(limit):
     if limit:
         return min(CONF.api.limit_max, limit) or CONF.api.limit_max
     else:
-        return CONF.api_limit_max
+        return CONF.api.limit_max
 
 
 def validate_sort_dir(sort_dir):