Correct pillar usage
Fix YAML errors