diff --git a/source/_components/arcam_fmj.markdown b/source/_components/arcam_fmj.markdown
index bd47be6b678..bfe85d9dc49 100644
--- a/source/_components/arcam_fmj.markdown
+++ b/source/_components/arcam_fmj.markdown
@@ -17,7 +17,7 @@ The `arcam_fmj` integration allows you to control [Arcam FMJ Receveivers](https:
 
 Supported devices:
 
-- AVR 380 
+- AVR 380
 - AVR 450
 - AVR 750
 - Likely other AVRs
@@ -49,15 +49,18 @@ zone:
   type: map
   keys:
     ZONE_INDEX:
-      name:
-        description: Name of zone
-        required: false
-        type: string
-        default: Arcam FMJ - ZONE_INDEX
-      turn_on:
-        description: Service to use when turning on device when no connection is established
-        required: false
-        type: action
+      description: Zone index number.
+      type: map
+      keys:
+        name:
+          description: Name of zone
+          required: false
+          type: string
+          default: Arcam FMJ - ZONE_INDEX
+        turn_on:
+          description: Service to use when turning on device when no connection is established
+          required: false
+          type: action
 {% endconfiguration %}
 
 ```yaml
diff --git a/source/_components/climate.markdown b/source/_components/climate.markdown
index 8431c9f216f..07687206975 100644
--- a/source/_components/climate.markdown
+++ b/source/_components/climate.markdown
@@ -80,7 +80,7 @@ Set target temperature of climate device
 | `temperature` | no | New target temperature for hvac
 | `target_temp_high` | yes | New target high temperature for hvac
 | `target_temp_low` | yes | New target low temperature for hvac
-| `operation_mode` | yes | Operation mode to set temperature to. This defaults to current_operation mode if not set, or set incorrectly.
+| `hvac_mode` | yes | HVAC mode to set temperature to. This defaults to current HVAC mode if not set, or set incorrectly.
 
 #### Automation example
 
@@ -94,7 +94,7 @@ automation:
       data:
         entity_id: climate.kitchen
         temperature: 24
-        operation_mode: Heat
+        hvac_mode: heat
 ```
 
 ### Service `climate.set_humidity`
@@ -163,7 +163,7 @@ automation:
     - service: climate.set_hvac_mode
       data:
         entity_id: climate.kitchen
-        operation_mode: heat
+        hvac_mode: heat
 ```
 
 ### Service `climate.set_swing_mode`
diff --git a/source/_components/climate.mqtt.markdown b/source/_components/climate.mqtt.markdown
index dca79228e42..575d753fb42 100644
--- a/source/_components/climate.mqtt.markdown
+++ b/source/_components/climate.mqtt.markdown
@@ -200,6 +200,7 @@ hold_state_template:
 hold_modes:
   description: A list of available hold modes.
   required: false
+  type: list
 aux_command_topic:
   description: The MQTT topic to publish commands to switch auxiliary heat.
   required: false
@@ -281,7 +282,7 @@ climate:
     name: Study
     modes:
       - "off"
-      - "on"
+      - "heat"
       - "auto"
     mode_command_topic: "study/ac/mode/set"
     mode_state_topic: "study/ac/mode/state"
diff --git a/source/_components/vacuum.template.markdown b/source/_components/vacuum.template.markdown
index f327654fe4e..7c0f00796a2 100644
--- a/source/_components/vacuum.template.markdown
+++ b/source/_components/vacuum.template.markdown
@@ -84,7 +84,7 @@ vacuum:
       fan_speeds:
         description: List of fan speeds supported by the vacuum.
         required: false
-        type: string list
+        type: [string, list]
 {% endconfiguration %}
 
 ## {% linkable_title Examples %}
diff --git a/source/_components/wwlln.markdown b/source/_components/wwlln.markdown
index 4a2fa75fefc..23c4dab3b00 100644
--- a/source/_components/wwlln.markdown
+++ b/source/_components/wwlln.markdown
@@ -50,7 +50,7 @@ longitude:
 radius:
   description: The radius around your location to monitor; defaults to 25 km or mi (depending on the unit system defined in your `configuration.yaml`).
   required: false
-  type: int
+  type: integer
 window:
   description: The amount of time before now for which strikes should be considered "active" and shown in the UI.
   required: false