Fix up a couple of minor errors.

The first commit was untested, this resolves a name clash and getting
the name of YAML's load_file right.