diff --git a/distro/configuration/ampathforms/ct_clinical_visit_v2.0.json b/distro/configuration/ampathforms/ct_clinical_visit_v2.0.json
index ca6c534f5..69eb5cb44 100644
--- a/distro/configuration/ampathforms/ct_clinical_visit_v2.0.json
+++ b/distro/configuration/ampathforms/ct_clinical_visit_v2.0.json
@@ -9106,12 +9106,8 @@
               "label": "CD4 Lab Results",
               "type": "obs",
               "questionOptions": {
-                "rendering": "toggle",
+                "rendering": "radio",
                 "concept": "2dbf01ab-77f6-4b35-aa2c-46dfc14b0af0",
-                "toggleOptions": {
-                  "labelTrue": "Yes",
-                  "labelFalse": "No"
-                },
                 "conceptMappings": [
                   {
                     "type": "OCT",
@@ -9160,12 +9156,8 @@
               "label": "Viral Lab Results",
               "type": "obs",
               "questionOptions": {
-                "rendering": "toggle",
+                "rendering": "radio",
                 "concept": "2dbf01ab-77f6-4b35-aa2c-46dfc14b0af0",
-                "toggleOptions": {
-                  "labelTrue": "Yes",
-                  "labelFalse": "No"
-                },
                 "conceptMappings": [
                   {
                     "type": "OCT",
diff --git a/distro/configuration/ampathforms/ct_viral_load_results_v1.0.json b/distro/configuration/ampathforms/ct_viral_load_results_v1.0.json
index e1159b2c6..e337912e3 100644
--- a/distro/configuration/ampathforms/ct_viral_load_results_v1.0.json
+++ b/distro/configuration/ampathforms/ct_viral_load_results_v1.0.json
@@ -273,8 +273,8 @@
               "questionOptions": {
                 "rendering": "number",
                 "concept": "856AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-                "max": "",
-                "min": "51",
+                "max": "10000000",
+                "min": "20",
                 "showDate": "",
                 "conceptMappings": [
                   {