Yaml syntax fixes