Fixed several YAML data issues