Fix a few bugs

Avoid nonsensish YAML output