Fixing some YAML bugs