Fix YAML support and improve reporting consistency