More fixes to circle.yml.