Fixes for the YAML and stack level errors.