More YAML bugs