A few more filenames as %s instead of %r