Slight YAML tweaks