Partial fix to YAML configure suport...