Tiny change to Yaml functions