Fix YamlDriver