More YAML fixes