YAML: bug fixes