More pip/yaml syntax fixes.