Fix YAML parsing to restore proper formatting...