Misc YAML fixes