Fix for YAML errors