Fix YAML slowness and fix a bad mapping for unite