Fix Yaml parsing