diff --git a/tools/submission/generate-final-report.py b/tools/submission/generate-final-report.py
index 188b62e91..d9c339d71 100644
--- a/tools/submission/generate-final-report.py
+++ b/tools/submission/generate-final-report.py
@@ -49,8 +49,8 @@ def main():
 
   # cleanup counts
   df['Accelerator'] = df['Accelerator'].apply(lambda x: x if x != '-' else '')
-  df['a#'] = df['a#'].apply(lambda x: int(x) if x != '' else 0)
-  df['a#'] = df['a#'].apply(lambda x: x if x > 0 else '')
+  df['a#'] = df['a#'].apply(lambda x: int(x) if x.isnumeric() else x)
+  df['a#'] = df['a#'].apply(lambda x: x if x != 0 else '')
   df['p#'] = df.apply(lambda x: int(x['host_processors_per_node']), axis=1)
 
   # details url
diff --git a/tools/submission/submission-checker.py b/tools/submission/submission-checker.py
index 0d9eb0fae..4f7f12cb4 100755
--- a/tools/submission/submission-checker.py
+++ b/tools/submission/submission-checker.py
@@ -868,7 +868,7 @@
         "model_mapping": {
             # map model names to the official mlperf model class
             "ssd-mobilenet": "ssd-small",
-            "ssd-resnet34": "ssd-large",
+            "ssd-resnet34": "retinanet",
             "mobilenet": "resnet",
             "resnet50": "resnet",
             "ssd_resnet101_v1_fpn_640x640": "ssd-small",
@@ -1820,7 +1820,7 @@ def log_result(submitter,
                    system_json.get("host_processors_per_node"),
                    system_json.get("host_processor_core_count"),
                    '"' + system_json.get("accelerator_model_name") + '"',
-                   system_json.get("accelerators_per_node"),
+                   '"' + str(system_json.get("accelerators_per_node")) + '"',
                    name.replace("\\", "/"),
                    '"' + system_json.get("framework", "") + '"',
                    '"' + system_json.get("operating_system", "") + '"',
@@ -1837,7 +1837,7 @@ def log_result(submitter,
                      system_json.get("host_processors_per_node"),
                      system_json.get("host_processor_core_count"),
                      '"' + system_json.get("accelerator_model_name") + '"',
-                     system_json.get("accelerators_per_node"),
+                     '"' + str(system_json.get("accelerators_per_node")) + '"',
                      name.replace("\\", "/"),
                      '"' + system_json.get("framework", "") + '"',
                      '"' + system_json.get("operating_system", "") + '"',