A few fixes to these files.