diff --git a/caimira/apps/calculator/__init__.py b/caimira/apps/calculator/__init__.py
index e0a2fd78..7dc383a7 100644
--- a/caimira/apps/calculator/__init__.py
+++ b/caimira/apps/calculator/__init__.py
@@ -435,7 +435,8 @@ def make_app(
         'data_service_client_password': os.environ.get('DATA_SERVICE_CLIENT_PASSWORD', None),
     }
     data_service = None
-    if bool(os.environ.get('DATA_SERVICE_ENABLED', False)):
+    data_service_enabled = os.environ.get('DATA_SERVICE_ENABLED', 'False').lower() == 'true'
+    if data_service_enabled:
         data_service = DataService(data_service_credentials)
 
     if debug:
diff --git a/caimira/apps/calculator/report_generator.py b/caimira/apps/calculator/report_generator.py
index b4510b3f..6efb9177 100644
--- a/caimira/apps/calculator/report_generator.py
+++ b/caimira/apps/calculator/report_generator.py
@@ -338,7 +338,7 @@ def manufacture_viral_load_scenarios_percentiles(model: mc.ExposureModel) -> typ
         specific_vl_scenario = dataclass_utils.nested_replace(model, 
             {'concentration_model.infected.virus.viral_load_in_sputum': vl}
         )
-        scenarios[vl] = np.mean(specific_vl_scenario.infection_probability())
+        scenarios[str(vl)] = np.mean(specific_vl_scenario.infection_probability())
     return scenarios